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

This commit is contained in:
Lennart Poettering 2010-07-07 22:29:41 +02:00
parent e167fb86f6
commit 07405e9096
6 changed files with 6 additions and 22 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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)

View File

@ -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)

View File

@ -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