diff options
| author | Andrew Edmunds <Andrew.Edmunds@yahoo.com.au> | 2010-10-25 23:22:28 +1000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-10-25 21:09:56 +0200 |
| commit | 858dae181bb5461201ac1c04732d3ef4c67a0256 (patch) | |
| tree | 5d5564005e1d8cbe1e9ece1e20705a7a76ebbe63 /src | |
| parent | 1104f3c1604874c2b742e761b56f4349fe3e1e58 (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')
| -rw-r--r-- | src/locale-setup.c | 2 | ||||
| -rw-r--r-- | src/service.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/locale-setup.c b/src/locale-setup.c index ffb4ee999e..b3375e99b1 100644 --- a/src/locale-setup.c +++ b/src/locale-setup.c @@ -135,7 +135,7 @@ int locale_setup(void) { log_warning("Failed to read /etc/sysconfig/language: %s", strerror(-r)); } -#elif defined(TARGET_DEBIAN) +#elif defined(TARGET_DEBIAN) || defined(TARGET_UBUNTU) if (r <= 0 && (r = parse_env_file("/etc/default/locale", NEWLINE, "LANG", &variables[VARIABLE_LANG], 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, |