summaryrefslogtreecommitdiff
path: root/src/service.c
diff options
context:
space:
mode:
authorAndrew Edmunds <Andrew.Edmunds@yahoo.com.au>2010-10-25 23:22:28 +1000
committerLennart Poettering <lennart@poettering.net>2010-10-25 21:09:56 +0200
commit858dae181bb5461201ac1c04732d3ef4c67a0256 (patch)
tree5d5564005e1d8cbe1e9ece1e20705a7a76ebbe63 /src/service.c
parent1104f3c1604874c2b742e761b56f4349fe3e1e58 (diff)
ubuntu: Treat Ubuntu as a distinct distro in configure.ac etc
Previously Ubuntu was treated as being equivalent to Debian, but the two distributions require different behaviour in certain places. This commit does not change the behaviour of systemd on either distro but it creates a framework for changes to be introduced by later commits. The following previously meant "Target is Debian or Ubuntu". * configure option "--with-distro=debian" * C preprocessor symbol "TARGET_DEBIAN" * Automake conditional "TARGET_DEBIAN" After this commit, all of the above are redefined to mean "Target is Debian" The following are introduced to mean "Target is Ubuntu". * configure option "--with-distro=ubuntu" * C preprocessor symbol "TARGET_UBUNTU" * Automake conditional "TARGET_UBUNTU" Most code written for Debian will also be applicable to Ubuntu. An extra Automake conditional "TARGET_DEBIAN_OR_UBUNTU" is introduced to avoid duplication of code that would otherwise occur. This commit updates configure.ac, Makefile.am and distro-specific source files in line with the above definitions.
Diffstat (limited to 'src/service.c')
-rw-r--r--src/service.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/service.c b/src/service.c
index 6d6c540a72..7a522bf3f4 100644
--- a/src/service.c
+++ b/src/service.c
@@ -65,7 +65,7 @@ static const struct {
{ "boot.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT },
#endif
-#ifdef TARGET_DEBIAN
+#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
/* Debian style rcS.d */
{ "rcS.d", SPECIAL_SYSINIT_TARGET, RUNLEVEL_SYSINIT },
#endif
@@ -274,7 +274,7 @@ static int sysv_translate_facility(const char *name, const char *filename, char
"time", SPECIAL_RTC_SET_TARGET,
/* Debian extensions */
-#ifdef TARGET_DEBIAN
+#if defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU)
"mail-transport-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,
#endif
"mail-transfer-agent", SPECIAL_MAIL_TRANSFER_AGENT_TARGET,