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 /units | |
| 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 'units')
| -rw-r--r-- | units/getty@.service.m4 | 1 | ||||
| -rw-r--r-- | units/multi-user.target.m4 | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index 4691ea7bfe..98c6a88213 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -8,6 +8,7 @@ m4_ifdef(`TARGET_FEDORA', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl m4_ifdef(`TARGET_SUSE', `m4_define(`GETTY', `/sbin/mingetty')')m4_dnl m4_ifdef(`TARGET_DEBIAN', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl +m4_ifdef(`TARGET_UBUNTU', `m4_define(`GETTY', `/sbin/getty 38400')')m4_dnl m4_ifdef(`TARGET_GENTOO', `m4_define(`GETTY', `/sbin/agetty 38400')')m4_dnl m4_ifdef(`TARGET_ARCH', `m4_define(`GETTY', `/sbin/agetty -8 38400')')m4_dnl m4_dnl diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4 index cf290e7cf5..8f8903f2cc 100644 --- a/units/multi-user.target.m4 +++ b/units/multi-user.target.m4 @@ -21,9 +21,11 @@ m4_ifdef(`TARGET_SUSE', Names=runlevel3.target )m4_dnl m4_ifdef(`TARGET_DEBIAN', -m4_dnl On Debian Runlevel 2, 3, 4 and 5 are multi-user +m4_ifdef(`TARGET_UBUNTU', +m4_dnl On Debian/Ubuntu Runlevel 2, 3, 4 and 5 are multi-user Names=runlevel2.target runlevel3.target runlevel4.target runlevel5.target )m4_dnl +)m4_dnl AllowIsolate=yes [Install] |