diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-11-23 22:55:38 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-11-24 00:24:46 +0100 |
| commit | 0979f2855c81d144d4c7d814678a5b5b2d34155b (patch) | |
| tree | ced53cd8ef7b46f115fff103d095e37f7820ae44 /src | |
| parent | 92134489ab35f6d173cb6fb6f676c1b5d88f5556 (diff) | |
build-sys: drop TARGET_UBUNTU
TARGET_UBUNTU is effectively the same as TARGET_DEBIAN. Given the Ubuntu
is unlikely to use systemd anytime soon there's no point in keeping this
separate.
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/locale-setup.c | 2 | ||||
| -rw-r--r-- | src/core/service.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/locale-setup.c b/src/core/locale-setup.c index 0a0f95b909..8821fc2a2d 100644 --- a/src/core/locale-setup.c +++ b/src/core/locale-setup.c @@ -141,7 +141,7 @@ int locale_setup(void) { log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r)); } -#elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM) +#elif defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM) if (r <= 0) { r = parse_env_file("/etc/default/locale", NEWLINE, "LANG", &variables[VARIABLE_LANG], diff --git a/src/core/service.c b/src/core/service.c index 25a568f70b..3d2be96f5b 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -321,7 +321,7 @@ static char *sysv_translate_name(const char *name) { if (!(r = new(char, strlen(name) + sizeof(".service")))) return NULL; -#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM) +#if defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM) if (endswith(name, ".sh")) /* Drop Debian-style .sh suffix */ strcpy(stpcpy(r, name) - 3, ".service"); @@ -368,7 +368,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char "x-display-manager", SPECIAL_DISPLAY_MANAGER_SERVICE, "null", NULL, -#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM) +#if defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM) "mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET, #endif @@ -990,7 +990,7 @@ static int service_load_sysv_name(Service *s, const char *name) { /* For SysV services we strip the rc.* and *.sh * prefixes/suffixes. */ -#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM) +#if defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM) if (endswith(name, ".sh.service")) return -ENOENT; #endif @@ -1013,7 +1013,7 @@ static int service_load_sysv_name(Service *s, const char *name) { r = service_load_sysv_path(s, path); -#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) || defined(TARGET_ANGSTROM) +#if defined(TARGET_DEBIAN) || defined(TARGET_ANGSTROM) if (r >= 0 && UNIT(s)->load_state == UNIT_STUB) { /* Try Debian style *.sh source'able init scripts */ strcat(path, ".sh"); |