diff --git a/Makefile.am b/Makefile.am
index c3e3ad280e..7193c86f49 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
diff --git a/man/bootup.xml b/man/bootup.xml
index ae84cff0b7..69f9a273b9 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -183,32 +183,32 @@
- (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
-reboot.target poweroff.target halt.target kexec.target
+ (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
+ reboot.target poweroff.target halt.target kexec.target
Commonly used system shutdown targets are emphasized.
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 4321f54698..fdb2020376 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -57,8 +57,8 @@
default.target,
display-manager.service,
emergency.target,
- exit.service,
- final.service,
+ exit.target,
+ final.target,
getty.target,
graphical.target,
hibernate.target,
@@ -813,7 +813,7 @@
- exit.service
+ exit.target
A special service unit
for shutting down the
diff --git a/units/.gitignore b/units/.gitignore
index 6808d1c82e..2193bedf61 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -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
diff --git a/units/halt.target b/units/halt.target
index 41266b96f0..a21d984b26 100644
--- a/units/halt.target
+++ b/units/halt.target
@@ -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]
diff --git a/units/hibernate.target b/units/hibernate.target
index fc8493c208..c56460237d 100644
--- a/units/hibernate.target
+++ b/units/hibernate.target
@@ -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
diff --git a/units/kexec.target b/units/kexec.target
index be8eafcf1f..90795d0c5a 100644
--- a/units/kexec.target
+++ b/units/kexec.target
@@ -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]
diff --git a/units/poweroff.target b/units/poweroff.target
index bb60c33dd9..71871033a5 100644
--- a/units/poweroff.target
+++ b/units/poweroff.target
@@ -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]
diff --git a/units/reboot.target b/units/reboot.target
index 9faeb1800f..dec8f56796 100644
--- a/units/reboot.target
+++ b/units/reboot.target
@@ -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]
diff --git a/units/suspend.target b/units/suspend.target
index eaf79bed11..83f69f1b54 100644
--- a/units/suspend.target
+++ b/units/suspend.target
@@ -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
diff --git a/units/halt.service.in b/units/systemd-halt.service.in
similarity index 100%
rename from units/halt.service.in
rename to units/systemd-halt.service.in
diff --git a/units/hibernate.service.in b/units/systemd-hibernate.service.in
similarity index 100%
rename from units/hibernate.service.in
rename to units/systemd-hibernate.service.in
diff --git a/units/kexec.service.in b/units/systemd-kexec.service.in
similarity index 100%
rename from units/kexec.service.in
rename to units/systemd-kexec.service.in
diff --git a/units/poweroff.service.in b/units/systemd-poweroff.service.in
similarity index 100%
rename from units/poweroff.service.in
rename to units/systemd-poweroff.service.in
diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index 8ea575035e..e9156ef086 100644
--- a/units/systemd-random-seed-load.service.in
+++ b/units/systemd-random-seed-load.service.in
@@ -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
diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in
index 05b3c61471..3444d4ce70 100644
--- a/units/systemd-random-seed-save.service.in
+++ b/units/systemd-random-seed-save.service.in
@@ -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
diff --git a/units/reboot.service.in b/units/systemd-reboot.service.in
similarity index 100%
rename from units/reboot.service.in
rename to units/systemd-reboot.service.in
diff --git a/units/suspend.service.in b/units/systemd-suspend.service.in
similarity index 100%
rename from units/suspend.service.in
rename to units/systemd-suspend.service.in
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 6666dbd790..7b6fbadf12 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -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
diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
index 5b726c3688..8615d150b5 100644
--- a/units/systemd-update-utmp-shutdown.service.in
+++ b/units/systemd-update-utmp-shutdown.service.in
@@ -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
diff --git a/units/user/.gitignore b/units/user/.gitignore
index eeb62b32ba..41a74f5461 100644
--- a/units/user/.gitignore
+++ b/units/user/.gitignore
@@ -1 +1 @@
-exit.service
+/systemd-exit.service
diff --git a/units/user/exit.target b/units/user/exit.target
index 539e03a9aa..b0ad24c488 100644
--- a/units/user/exit.target
+++ b/units/user/exit.target
@@ -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]
diff --git a/units/user/exit.service.in b/units/user/systemd-exit.service.in
similarity index 100%
rename from units/user/exit.service.in
rename to units/user/systemd-exit.service.in