picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

units: rename halt/hibernate/kexec/poweroff/reboot/suspend to systed-xxx 

These service units also execute our own code, hence rename the
accordingly and prefix them with systemd-
This commit is contained in:
Lennart Poettering 2012-06-25 14:24:56 +02:00
parent 93a1d735ac
commit 0e0320e045
23 changed files with 107 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Makefile.am
View File

@ -328,17 +328,17 @@ nodist_systemunit_DATA = \
units/systemd-ask-password-wall.service \
units/systemd-ask-password-console.service \
units/systemd-sysctl.service \
units/halt.service \
units/emergency.service \
units/hibernate.service \
units/poweroff.service \
units/reboot.service \
units/kexec.service \
units/rescue.service \
units/user@.service \
units/systemd-hibernate.service \
units/systemd-suspend.service \
units/systemd-halt.service \
units/systemd-poweroff.service \
units/systemd-reboot.service \
units/systemd-kexec.service \
units/systemd-fsck@.service \
units/systemd-fsck-root.service \
units/rescue.service \
units/suspend.service \
units/user@.service \
units/systemd-udev.service \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
@ -349,7 +349,7 @@ dist_userunit_DATA = \
units/user/exit.target
nodist_userunit_DATA = \
units/user/exit.service
units/user/systemd-exit.service
EXTRA_DIST += \
units/getty@.service.m4 \
@ -369,11 +369,11 @@ EXTRA_DIST += \
units/systemd-ask-password-console.service.in \
units/systemd-sysctl.service.in \
units/emergency.service.in \
units/halt.service.in \
units/poweroff.service.in \
units/reboot.service.in \
units/kexec.service.in \
units/user/exit.service.in \
units/systemd-halt.service.in \
units/systemd-poweroff.service.in \
units/systemd-reboot.service.in \
units/systemd-kexec.service.in \
units/user/systemd-exit.service.in \
units/systemd-fsck@.service.in \
units/systemd-fsck-root.service.in \
units/user@.service.in \
@ -381,8 +381,8 @@ EXTRA_DIST += \
units/systemd-udev-trigger.service \
units/systemd-udev-settle.service \
units/systemd-debug-shell.service.in \
units/hibernate.service.in \
units/suspend.service.in \
units/systemd-hibernate.service.in \
units/systemd-suspend.service.in \
introspect.awk \
man/custom-html.xsl

52
man/bootup.xml
View File

@ -183,32 +183,32 @@
<programlisting> (conflicts with (conflicts with
all system all file system
services) mounts, swaps,
| cryptsetup
| devices, ...)
| |
v v
shutdown.target umount.target
| |
\_______ ______/
\ /
v
(various low-level
services)
|
v
final.target
|
__________________________/ \_____________________
/ | | \
| | | |
v v v v
reboot.service poweroff.service halt.service kexec.service
| | | |
v v v v
<emphasis>reboot.target</emphasis> <emphasis>poweroff.target</emphasis> <emphasis>halt.target</emphasis> <emphasis>kexec.target</emphasis></programlisting>
<programlisting> (conflicts with (conflicts with
all system all file system
services) mounts, swaps,
| cryptsetup
| devices, ...)
| |
v v
shutdown.target umount.target
| |
\_______ ______/
\ /
v
(various low-level
services)
|
v
final.target
|
_____________________________________/ \_________________________________
/ | | \
| | | |
v v v v
systemd-reboot.service systemd-poweroff.service systemd-halt.service systemd-kexec.service
| | | |
v v v v
<emphasis>reboot.target</emphasis> <emphasis>poweroff.target</emphasis> <emphasis>halt.target</emphasis> <emphasis>kexec.target</emphasis></programlisting>
<para>Commonly used system shutdown targets are <emphasis>emphasized</emphasis>.</para>
</refsect1>

6
man/systemd.special.xml
View File

@ -57,8 +57,8 @@
<filename>default.target</filename>,
<filename>display-manager.service</filename>,
<filename>emergency.target</filename>,
<filename>exit.service</filename>,
<filename>final.service</filename>,
<filename>exit.target</filename>,
<filename>final.target</filename>,
<filename>getty.target</filename>,
<filename>graphical.target</filename>,
<filename>hibernate.target</filename>,
@ -813,7 +813,7 @@
<variablelist>
<varlistentry>
<term><filename>exit.service</filename></term>
<term><filename>exit.target</filename></term>
<listitem>
<para>A special service unit
for shutting down the

74
units/.gitignore vendored
View File

@ -1,48 +1,44 @@
/hibernate.service
/suspend.service
/systemd-hibernate.service
/systemd-suspend.service
/console-getty.service
/systemd-journald.service
user@.service
systemd-logind.service
systemd-localed.service
systemd-timedated.service
systemd-hostnamed.service
console-shell.service
systemd-sysctl.service
systemd-ask-password-console.service
rescue.service
systemd-ask-password-wall.service
/user@.service
/systemd-logind.service
/systemd-localed.service
/systemd-timedated.service
/systemd-hostnamed.service
/console-shell.service
/systemd-sysctl.service
/systemd-ask-password-console.service
/rescue.service
/systemd-ask-password-wall.service
/systemd-quotacheck.service
/systemd-fsck@.service
/systemd-fsck-root.service
systemd-tmpfiles-clean.service
systemd-tmpfiles-setup.service
halt.service
poweroff.service
reboot.service
kexec.service
systemd-user-sessions.service
systemd-readahead-done.service
systemd-tmpfiles.service
systemd-readahead-collect.service
systemd-readahead-replay.service
serial-getty@.service
systemd-kmsg-syslogd.service
systemd-modules-load.service
/systemd-tmpfiles-clean.service
/systemd-tmpfiles-setup.service
/systemd-halt.service
/systemd-poweroff.service
/systemd-reboot.service
/systemd-kexec.service
/systemd-user-sessions.service
/systemd-readahead-done.service
/systemd-tmpfiles.service
/systemd-readahead-collect.service
/systemd-readahead-replay.service
/serial-getty@.service
/systemd-modules-load.service
/systemd-remount-fs.service
systemd-vconsole-setup.service
systemd-auto-serial-getty.service
systemd-shutdownd.service
systemd-random-seed-load.service
systemd-random-seed-save.service
systemd-initctl.service
systemd-stdout-syslog-bridge.service
getty@.service
systemd-update-utmp-runlevel.service
systemd-update-utmp-shutdown.service
test-env-replace
systemd-binfmt.service
emergency.service
/systemd-vconsole-setup.service
/systemd-shutdownd.service
/systemd-random-seed-load.service
/systemd-random-seed-save.service
/systemd-initctl.service
/getty@.service
/systemd-update-utmp-runlevel.service
/systemd-update-utmp-shutdown.service
/systemd-binfmt.service
/emergency.service
/systemd-udev-settle.service
/systemd-udev-trigger.service
/systemd-udev.service

4
units/halt.target
View File

@ -9,8 +9,8 @@
Description=Halt
Documentation=man:systemd.special(7)
DefaultDependencies=no
Requires=halt.service
After=halt.service
Requires=systemd-halt.service
After=systemd-halt.service
AllowIsolate=yes
[Install]

5
units/hibernate.target
View File

@ -9,6 +9,5 @@
Description=Hibernate
Documentation=man:systemd.special(7)
DefaultDependencies=no
BindTo=hibernate.service
After=hibernate.service
StopWhenUnneeded=yes
BindTo=systemd-hibernate.service
After=systemd-hibernate.service

4
units/kexec.target
View File

@ -9,8 +9,8 @@
Description=Reboot via kexec
Documentation=man:systemd.special(7)
DefaultDependencies=no
Requires=kexec.service
After=kexec.service
Requires=systemd-kexec.service
After=systemd-kexec.service
AllowIsolate=yes
[Install]

4
units/poweroff.target
View File

@ -9,8 +9,8 @@
Description=Power-Off
Documentation=man:systemd.special(7)
DefaultDependencies=no
Requires=poweroff.service
After=poweroff.service
Requires=systemd-poweroff.service
After=systemd-poweroff.service
AllowIsolate=yes
[Install]

4
units/reboot.target
View File

@ -9,8 +9,8 @@
Description=Reboot
Documentation=man:systemd.special(7)
DefaultDependencies=no
Requires=reboot.service
After=reboot.service
Requires=systemd-reboot.service
After=systemd-reboot.service
AllowIsolate=yes
[Install]

4
units/suspend.target
View File

@ -9,5 +9,5 @@
Description=Suspend
Documentation=man:systemd.special(7)
DefaultDependencies=no
BindTo=suspend.service
After=suspend.service
BindTo=systemd-suspend.service
After=systemd-suspend.service

0
units/halt.service.in → units/systemd-halt.service.in
View File

0
units/hibernate.service.in → units/systemd-hibernate.service.in
View File

0
units/kexec.service.in → units/systemd-kexec.service.in
View File

0
units/poweroff.service.in → units/systemd-poweroff.service.in
View File

5
units/systemd-random-seed-load.service.in
View File

@ -9,10 +9,9 @@
Description=Load Random Seed
Documentation=man:systemd-random-seed-load.service(8) man:random(4)
DefaultDependencies=no
Conflicts=shutdown.target
After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
Before=sysinit.target shutdown.target
RequiresMountsFor=@RANDOM_SEED@
After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
Before=sysinit.target final.target
[Service]
Type=oneshot

5
units/systemd-random-seed-save.service.in
View File

@ -9,10 +9,9 @@
Description=Save Random Seed
Documentation=man:systemd-random-seed-load.service(8) man:random(4)
DefaultDependencies=no
After=systemd-random-seed-load.service
Before=shutdown.target
Conflicts=systemd-random-seed-load.service
RequiresMountsFor=@RANDOM_SEED@
After=systemd-remount-fs.service systemd-random-seed-load.service
Before=final.target
[Service]
Type=oneshot

0
units/reboot.service.in → units/systemd-reboot.service.in
View File

0
units/suspend.service.in → units/systemd-suspend.service.in
View File

6
units/systemd-update-utmp-runlevel.service.in
View File

@ -9,8 +9,10 @@
Description=Update UTMP about System Runlevel Changes
Documentation=man:utmp(5)
DefaultDependencies=no
After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target systemd-tmpfiles-setup.service
Before=poweroff.service reboot.service halt.service
RequiresMountsFor=/var/log/wtmp
After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
Before=final.target
[Service]
Type=oneshot

6
units/systemd-update-utmp-shutdown.service.in
View File

@ -9,8 +9,10 @@
Description=Update UTMP about System Shutdown
Documentation=man:utmp(5)
DefaultDependencies=no
After=local-fs.target sysinit.target auditd.service systemd-update-utmp-runlevel.service
Before=poweroff.service reboot.service halt.service
RequiresMountsFor=/var/log/wtmp
After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
After=systemd-update-utmp-runlevel.service
Before=final.target
[Service]
Type=oneshot

2
units/user/.gitignore vendored
View File

@ -1 +1 @@
exit.service
/systemd-exit.service

4
units/user/exit.target
View File

@ -9,8 +9,8 @@
Description=Exit the Session
Documentation=man:systemd.special(7)
DefaultDependencies=no
Requires=exit.service
After=exit.service
Requires=systemd-exit.service
After=systemd-exit.service
AllowIsolate=yes
[Install]

0
units/user/exit.service.in → units/user/systemd-exit.service.in
View File