units: in order to make the default services parseable by GKeyFile, merge repeated...

diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index 815c8fbdad23428545f8363e6cd760c4f8563047..106ac6b691f01b1f74c4849120a58227d8475b52 100644 (file)
--- 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
 [Service]
 Type=finish
 ValidNoProcess=yes

-Environment=INIT_HALT=HALT
-Environment=RUNLEVEL=0
+Environment=INIT_HALT=HALT RUNLEVEL=0

 ExecStart=/etc/init.d/halt start
 ExecStart=/etc/init.d/halt start

diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service
index ecf4cff4f58b8af5b246de1acc4e45920dec1def..56ac49388122222445b80a268633772b8f8ed467 100644 (file)
--- 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
 [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
 ExecStart=/etc/init.d/shutdown.sh

diff --git a/units/getty@.service.m4 b/units/getty@.service.m4
index f1f7f326304b9e12777755f49883665643688cd5..b82f5aad25e1485d602e2b7e227a92a0d58690b5 100644 (file)
--- a/units/getty@.service.m4
+++ b/units/getty@.service.m4
@@ -29,9 +29,4 @@ RestartSec=0
 KillMode=process-group
 
 [Install]
 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 6228026dcad1c6572986af069c12a73f5e44e5d6..468770a55433cba66d7d6427f0a4367deba2fbf2 100644 (file)
--- a/units/graphical.target.m4
+++ b/units/graphical.target.m4
@@ -22,7 +22,4 @@ Names=runlevel5.target
 )m4_dnl
 
 [Install]
 )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 eb46b2b4ac215bed5f2f6d27aea80c2125e70f7b..010e7d8474016f2c16adfc3379a0d354fc779c90 100644 (file)
--- a/units/multi-user.target.m4
+++ b/units/multi-user.target.m4
@@ -22,9 +22,4 @@ Names=runlevel3.target
 )m4_dnl
 
 [Install]
 )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 fbcf154f578a4d5205babc52faa67222c1a09a69..40d58b36b5ed6bb90f20c23556817f2b6413e1fd 100644 (file)
--- 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
 [Service]
 Type=finish
 ValidNoProcess=yes

-Environment=INIT_HALT=HALT
-Environment=RUNLEVEL=0
+Environment=INIT_HALT=HALT RUNLEVEL=0

 ExecStart=/etc/init.d/halt start
 ExecStart=/etc/init.d/halt start