diff options
-rw-r--r-- | Makefile.am | 6 | ||||
-rw-r--r-- | configure.ac | 9 | ||||
-rw-r--r-- | src/core/locale-setup.c | 2 | ||||
-rw-r--r-- | src/core/service.c | 8 |
4 files changed, 6 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 25f8231b50..5d772be942 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4111,12 +4111,6 @@ if TARGET_MANDRIVA $(LN_S) rescue.service single.service ) endif -if TARGET_DEBIAN_OR_UBUNTU - ( cd $(DESTDIR)$(systemunitdir) && \ - rm -f runlevel5.target && \ - $(LN_S) multi-user.target runlevel5.target ) -endif - if TARGET_SUSE ( cd $(DESTDIR)$(systemunitdir) && \ rm -f local.service && \ diff --git a/configure.ac b/configure.ac index 393c7ce88e..d0003bb5bd 100644 --- a/configure.ac +++ b/configure.ac @@ -640,7 +640,7 @@ AM_CONDITIONAL(ENABLE_MANPAGES, [test "x$have_manpages" = "xyes"]) # ------------------------------------------------------------------------------ -AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, ubuntu, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other])) +AC_ARG_WITH(distro, AS_HELP_STRING([--with-distro=DISTRO],[Specify the distribution to target: One of fedora, suse, debian, arch, gentoo, slackware, altlinux, mandriva, mageia, angstrom or other])) if test "z$with_distro" = "z"; then if test "$cross_compiling" = yes; then AC_MSG_WARN([Target distribution cannot be reliably detected when cross-compiling. You should specify it with --with-distro (see $0 --help for recognized distros)]) @@ -676,11 +676,6 @@ case $with_distro in AC_DEFINE(TARGET_DEBIAN, [], [Target is Debian]) M4_DEFINES=-DTARGET_DEBIAN=1 ;; - ubuntu) - SYSTEM_SYSVRCND_PATH=/etc - AC_DEFINE(TARGET_UBUNTU, [], [Target is Ubuntu]) - M4_DEFINES=-DTARGET_UBUNTU=1 - ;; arch) SYSTEM_SYSVINIT_PATH= SYSTEM_SYSVRCND_PATH= @@ -765,8 +760,6 @@ AC_ARG_WITH([tty-gid], AM_CONDITIONAL(TARGET_FEDORA, test x"$with_distro" = xfedora) AM_CONDITIONAL(TARGET_SUSE, test x"$with_distro" = xsuse) AM_CONDITIONAL(TARGET_DEBIAN, test x"$with_distro" = xdebian) -AM_CONDITIONAL(TARGET_UBUNTU, test x"$with_distro" = xubuntu) -AM_CONDITIONAL(TARGET_DEBIAN_OR_UBUNTU, test x"$with_distro" = xdebian -o x"$with_distro" = xubuntu) AM_CONDITIONAL(TARGET_ARCH, test x"$with_distro" = xarch) AM_CONDITIONAL(TARGET_GENTOO, test x"$with_distro" = xgentoo) AM_CONDITIONAL(TARGET_SLACKWARE, test x"$with_distro" = xslackware) 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"); |