mirror of
https://github.com/systemd/systemd.git
synced 2025-01-11 09:18:07 +03:00
units: in order to make the default services parseable by GKeyFile, merge repeated lines
This commit is contained in:
parent
e167fb86f6
commit
07405e9096
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user