diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-07-07 22:29:41 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-07-07 22:29:41 +0200 |
| commit | 07405e90968c39f04bc00e1af5b1671940482b19 (patch) | |
| tree | d2cd6b2987ba8af3883537d2561a10ce6029ccef | |
| parent | e167fb86f6935c0fe989d6ccfbbc0acadba245a2 (diff) | |
units: in order to make the default services parseable by GKeyFile, merge repeated lines
| -rw-r--r-- | units/fedora/halt.service | 3 | ||||
| -rw-r--r-- | units/gentoo/halt.service | 3 | ||||
| -rw-r--r-- | units/getty@.service.m4 | 7 | ||||
| -rw-r--r-- | units/graphical.target.m4 | 5 | ||||
| -rw-r--r-- | units/multi-user.target.m4 | 7 | ||||
| -rw-r--r-- | units/suse/halt.service | 3 |
6 files changed, 6 insertions, 22 deletions
diff --git a/units/fedora/halt.service b/units/fedora/halt.service index 815c8fbdad..106ac6b691 100644 --- a/units/fedora/halt.service +++ b/units/fedora/halt.service @@ -15,6 +15,5 @@ Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.a [Service] Type=finish ValidNoProcess=yes -Environment=INIT_HALT=HALT -Environment=RUNLEVEL=0 +Environment=INIT_HALT=HALT RUNLEVEL=0 ExecStart=/etc/init.d/halt start diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service index ecf4cff4f5..56ac493881 100644 --- a/units/gentoo/halt.service +++ b/units/gentoo/halt.service @@ -15,6 +15,5 @@ Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.a [Service] Type=finish ValidNoProcess=yes -Environment=INIT_HALT=HALT -Environment=RC_DOWN_HARDDISK=yes +Environment=INIT_HALT=HALT RC_DOWN_HARDDISK=yes ExecStart=/etc/init.d/shutdown.sh diff --git a/units/getty@.service.m4 b/units/getty@.service.m4 index f1f7f32630..b82f5aad25 100644 --- a/units/getty@.service.m4 +++ b/units/getty@.service.m4 @@ -29,9 +29,4 @@ RestartSec=0 KillMode=process-group [Install] -Alias=getty.target.wants/getty@tty1.service -Alias=getty.target.wants/getty@tty2.service -Alias=getty.target.wants/getty@tty3.service -Alias=getty.target.wants/getty@tty4.service -Alias=getty.target.wants/getty@tty5.service -Alias=getty.target.wants/getty@tty6.service +Alias=getty.target.wants/getty@tty1.service getty.target.wants/getty@tty2.service getty.target.wants/getty@tty3.service getty.target.wants/getty@tty4.service getty.target.wants/getty@tty5.service getty.target.wants/getty@tty6.service diff --git a/units/graphical.target.m4 b/units/graphical.target.m4 index 6228026dca..468770a554 100644 --- a/units/graphical.target.m4 +++ b/units/graphical.target.m4 @@ -22,7 +22,4 @@ Names=runlevel5.target )m4_dnl [Install] -Alias=default.target -m4_ifdef(`TARGET_FEDORA', -Alias=runlevel5.target -)m4_dnl +Alias=default.target m4_ifdef(`TARGET_FEDORA', runlevel5.target) diff --git a/units/multi-user.target.m4 b/units/multi-user.target.m4 index eb46b2b4ac..010e7d8474 100644 --- a/units/multi-user.target.m4 +++ b/units/multi-user.target.m4 @@ -22,9 +22,4 @@ Names=runlevel3.target )m4_dnl [Install] -Alias=default.target -m4_ifdef(`TARGET_FEDORA', -Alias=runlevel2.target -Alias=runlevel3.target -Alias=runlevel4.target -)m4_dnl +Alias=default.target m4_ifdef(`TARGET_FEDORA', runlevel2.target runlevel3.target runlevel4.target) diff --git a/units/suse/halt.service b/units/suse/halt.service index fbcf154f57..40d58b36b5 100644 --- a/units/suse/halt.service +++ b/units/suse/halt.service @@ -15,6 +15,5 @@ Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.a [Service] Type=finish ValidNoProcess=yes -Environment=INIT_HALT=HALT -Environment=RUNLEVEL=0 +Environment=INIT_HALT=HALT RUNLEVEL=0 ExecStart=/etc/init.d/halt start |