From 3f141375cb4ff4f850b267258e776c90df594990 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 16 Jan 2013 03:46:38 +0100 Subject: service: sysv - remove distribution specific targets Systemd should not introduce any new facilities. Distributions which still need to support their non-standard/legacy facilities should add them as patches to their packaging. The following facilities are no longer recognized: $x-display-manager $mail-transfer-agent $mail-transport-agent $mail-transfer-agent $smtp $null This target is no longer available: mail-transfer-agent.target --- src/core/service.c | 8 -------- src/core/special.h | 2 -- 2 files changed, 10 deletions(-) (limited to 'src/core') diff --git a/src/core/service.c b/src/core/service.c index 7eaac0dc4c..017d292a8b 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -359,13 +359,6 @@ static int sysv_translate_facility(const char *name, const char *filename, char "remote_fs", SPECIAL_REMOTE_FS_TARGET, "syslog", SPECIAL_SYSLOG_TARGET, "time", SPECIAL_TIME_SYNC_TARGET, - - /* common extensions */ - "mail-transfer-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, - "x-display-manager", SPECIAL_DISPLAY_MANAGER_SERVICE, - "null", NULL, - "mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, - "smtp", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, }; unsigned i; @@ -815,7 +808,6 @@ static int service_load_sysv_path(Service *s, const char *path) { } r = sysv_translate_facility(n, path_get_file_name(path), &m); - if (r < 0) { log_error_unit(u->id, "[%s:%u] Failed to translate LSB dependency %s, ignoring: %s", diff --git a/src/core/special.h b/src/core/special.h index ef72260ecd..626e816922 100644 --- a/src/core/special.h +++ b/src/core/special.h @@ -59,8 +59,6 @@ #define SPECIAL_RPCBIND_TARGET "rpcbind.target" /* LSB's $portmap */ #define SPECIAL_SYSLOG_TARGET "syslog.target" /* LSB's $syslog */ #define SPECIAL_TIME_SYNC_TARGET "time-sync.target" /* LSB's $time */ -#define SPECIAL_DISPLAY_MANAGER_SERVICE "display-manager.service" /* Common extension of LSB */ -#define SPECIAL_MAIL_TRANSFER_AGENT_TARGET "mail-transfer-agent.target" /* Common extension of LSB */ /* * Rules regarding adding further high level targets like the above: -- cgit v1.2.3-54-g00ecf