diff options
| author | Lennart Poettering <lennart@poettering.net> | 2013-01-04 22:36:48 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2013-01-04 23:26:21 +0100 |
| commit | 83514a2fa0c9377e76dcc323ab7e7756b7f86cc4 (patch) | |
| tree | d87e039e91c03bef18d33540a5f44a3e4f5d1011 | |
| parent | 77e68fa2f0bd018bab2621a31919bfaa6a6b0a35 (diff) | |
units: drop distro specific stuff from units
Since rc-local is now enabled via the SysV compatibility we should only refer
to it based on that too.
| -rw-r--r-- | units/console-getty.service.m4.in | 17 | ||||
| -rw-r--r-- | units/console-shell.service.m4.in | 20 | ||||
| -rw-r--r-- | units/getty@.service.m4 | 20 | ||||
| -rw-r--r-- | units/serial-getty@.service.m4 | 20 |
4 files changed, 4 insertions, 73 deletions
diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in index 9d80d4b6f6..0426050ee8 100644 --- a/units/console-getty.service.m4.in +++ b/units/console-getty.service.m4.in @@ -9,22 +9,7 @@ Description=Console Getty Documentation=man:agetty(8) After=systemd-user-sessions.service plymouth-quit-wait.service -m4_ifdef(`TARGET_FEDORA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_ARCH', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_FRUGALWARE', -After=local.service -)m4_dnl -m4_ifdef(`TARGET_ALTLINUX', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MANDRIVA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MAGEIA', +m4_ifdef(`HAVE_SYSV_COMPAT', After=rc-local.service )m4_dnl Before=getty.target diff --git a/units/console-shell.service.m4.in b/units/console-shell.service.m4.in index e0fbc61b96..dac2ac212b 100644 --- a/units/console-shell.service.m4.in +++ b/units/console-shell.service.m4.in @@ -9,25 +9,7 @@ Description=Console Shell Documentation=man:sulogin(8) After=systemd-user-sessions.service plymouth-quit-wait.service -m4_ifdef(`TARGET_FEDORA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_DEBIAN', -After=rc.local.service -)m4_dnl -m4_ifdef(`TARGET_ARCH', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_FRUGALWARE', -After=local.service -)m4_dnl -m4_ifdef(`TARGET_ALTLINUX', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MANDRIVA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MAGEIA', +m4_ifdef(`HAVE_SYSV_COMPAT', After=rc-local.service )m4_dnl Before=getty.target diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index cc9a2ac644..083eb97059 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -10,25 +10,7 @@ Description=Getty on %I Documentation=man:agetty(8) man:systemd-getty-generator(8) Documentation=http://0pointer.de/blog/projects/serial-console.html After=systemd-user-sessions.service plymouth-quit-wait.service -m4_ifdef(`TARGET_FEDORA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_DEBIAN', -After=rc.local.service -)m4_dnl -m4_ifdef(`TARGET_ARCH', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_FRUGALWARE', -After=local.service -)m4_dnl -m4_ifdef(`TARGET_ALTLINUX', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MANDRIVA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MAGEIA', +m4_ifdef(`HAVE_SYSV_COMPAT', After=rc-local.service )m4_dnl diff --git a/units/serial-getty@.service.m4 b/units/serial-getty@.service.m4 index 11f5e2c006..60d7737b74 100644 --- a/units/serial-getty@.service.m4 +++ b/units/serial-getty@.service.m4 @@ -11,25 +11,7 @@ Documentation=man:agetty(8) man:systemd-getty-generator(8) Documentation=http://0pointer.de/blog/projects/serial-console.html BindsTo=dev-%i.device After=dev-%i.device systemd-user-sessions.service plymouth-quit-wait.service -m4_ifdef(`TARGET_FEDORA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_DEBIAN', -After=rc.local.service -)m4_dnl -m4_ifdef(`TARGET_ARCH', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_FRUGALWARE', -After=local.service -)m4_dnl -m4_ifdef(`TARGET_ALTLINUX', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MANDRIVA', -After=rc-local.service -)m4_dnl -m4_ifdef(`TARGET_MAGEIA', +m4_ifdef(`HAVE_SYSV_COMPAT', After=rc-local.service )m4_dnl |