Mon Jun 25 06:49:12 PDT 2012

Makefile.am                                   |   47 ++++++++-------
 man/bootup.xml                                |   52 ++++++++--------
 man/kernel-command-line.xml                   |    8 +-
 man/systemd.special.xml                       |    6 -
 src/core/mount.c                              |    2 
 src/core/special.h                            |    4 -
 src/cryptsetup/cryptsetup-generator.c         |    2 
 units/.gitignore                              |   80 ++++++++++++--------------
 units/fsck-root.service.in                    |   24 -------
 units/fsck at .service.in                        |   20 ------
 units/halt.service.in                         |   16 -----
 units/halt.target                             |    4 -
 units/hibernate.service.in                    |   16 -----
 units/hibernate.target                        |    5 -
 units/kexec.service.in                        |   16 -----
 units/kexec.target                            |    4 -
 units/poweroff.service.in                     |   16 -----
 units/poweroff.target                         |    4 -
 units/quotacheck.service.in                   |   19 ------
 units/quotaon.service                         |    2 
 units/reboot.service.in                       |   16 -----
 units/reboot.target                           |    4 -
 units/suspend.service.in                      |   16 -----
 units/suspend.target                          |    4 -
 units/systemd-fsck-root.service.in            |   24 +++++++
 units/systemd-fsck at .service.in                |   20 ++++++
 units/systemd-halt.service.in                 |   16 +++++
 units/systemd-hibernate.service.in            |   16 +++++
 units/systemd-kexec.service.in                |   16 +++++
 units/systemd-poweroff.service.in             |   16 +++++
 units/systemd-quotacheck.service.in           |   19 ++++++
 units/systemd-random-seed-load.service.in     |    5 -
 units/systemd-random-seed-save.service.in     |    5 -
 units/systemd-reboot.service.in               |   16 +++++
 units/systemd-remount-fs.service.in           |    2 
 units/systemd-suspend.service.in              |   16 +++++
 units/systemd-update-utmp-runlevel.service.in |    6 +
 units/systemd-update-utmp-shutdown.service.in |    6 +
 units/user/.gitignore                         |    2 
 units/user/exit.service.in                    |   17 -----
 units/user/exit.target                        |    4 -
 units/user/systemd-exit.service.in            |   17 +++++
 42 files changed, 305 insertions(+), 305 deletions(-)

New commits:
commit 448eefeba967d188b70d4aae9a30c8d120cf353b
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jun 25 15:49:05 2012 +0200

    build-sys: make distcheck pass

diff --git a/Makefile.am b/Makefile.am
index 7193c86..d59f666 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -898,6 +898,9 @@ EXTRA_DIST += \
 	src/core/systemd.pc.in \
 	src/core/macros.systemd.in
 
+CLEANFILES += \
+	src/core/macros.systemd
+
 # ------------------------------------------------------------------------------
 noinst_PROGRAMS += \
 	test-engine \

commit 6d37ea8a8ed417da8b536a836605f5f6c03bea2d
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jun 25 14:27:58 2012 +0200

    units: rename cryptsetup at .service to systemd-cryptsetup at .service
    
    It's also our own code, hence should have the prefix.

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 05808df..4166f36 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -81,7 +81,7 @@ static int create_disk(
         noauto = has_option(options, "noauto");
         nofail = has_option(options, "nofail");
 
-        n = unit_name_build_escape("cryptsetup", name, ".service");
+        n = unit_name_build_escape("systemd-cryptsetup", name, ".service");
         if (!n) {
                 r = -ENOMEM;
                 log_error("Failed to allocate unit name.");

commit 0e0320e04500d1e68630b3973714f14cfb7b3450
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jun 25 14:24:56 2012 +0200

    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-

diff --git a/Makefile.am b/Makefile.am
index c3e3ad2..7193c86 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/systemd-fsck at .service \
-	units/systemd-fsck-root.service \
 	units/rescue.service \
-	units/suspend.service \
 	units/user at .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 at .service \
+	units/systemd-fsck-root.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 at .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 at .service.in \
 	units/systemd-fsck-root.service.in \
 	units/user at .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 ae84cff..69f9a27 100644
--- a/man/bootup.xml
+++ b/man/bootup.xml
@@ -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>
diff --git a/man/systemd.special.xml b/man/systemd.special.xml
index 4321f54..fdb2020 100644
--- a/man/systemd.special.xml
+++ b/man/systemd.special.xml
@@ -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
diff --git a/units/.gitignore b/units/.gitignore
index 6808d1c..2193bed 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 at .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 at .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 at .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 at .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 at .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 at .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 at .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.service.in b/units/halt.service.in
deleted file mode 100644
index b746d1e..0000000
--- a/units/halt.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Halt
-DefaultDependencies=no
-Requires=shutdown.target umount.target final.target
-After=shutdown.target umount.target final.target
-
-[Service]
-Type=oneshot
-ExecStart=@SYSTEMCTL@ --force halt
diff --git a/units/halt.target b/units/halt.target
index 41266b9..a21d984 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.service.in b/units/hibernate.service.in
deleted file mode 100644
index 6dba653..0000000
--- a/units/hibernate.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Hibernate
-DefaultDependencies=no
-Requires=sleep.target
-After=sleep.target
-
-[Service]
-Type=oneshot
-ExecStart=@rootlibexecdir@/systemd-sleep hibernate
diff --git a/units/hibernate.target b/units/hibernate.target
index fc8493c..c564602 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.service.in b/units/kexec.service.in
deleted file mode 100644
index 17d0344..0000000
--- a/units/kexec.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Reboot via kexec
-DefaultDependencies=no
-Requires=shutdown.target umount.target final.target
-After=shutdown.target umount.target final.target
-
-[Service]
-Type=oneshot
-ExecStart=@SYSTEMCTL@ --force kexec
diff --git a/units/kexec.target b/units/kexec.target
index be8eafc..90795d0 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.service.in b/units/poweroff.service.in
deleted file mode 100644
index 851a0f9..0000000
--- a/units/poweroff.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Power-Off
-DefaultDependencies=no
-Requires=shutdown.target umount.target final.target
-After=shutdown.target umount.target final.target
-
-[Service]
-Type=oneshot
-ExecStart=@SYSTEMCTL@ --force poweroff
diff --git a/units/poweroff.target b/units/poweroff.target
index bb60c33..7187103 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.service.in b/units/reboot.service.in
deleted file mode 100644
index e6a8aab..0000000
--- a/units/reboot.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Reboot
-DefaultDependencies=no
-Requires=shutdown.target umount.target final.target
-After=shutdown.target umount.target final.target
-
-[Service]
-Type=oneshot
-ExecStart=@SYSTEMCTL@ --force reboot
diff --git a/units/reboot.target b/units/reboot.target
index 9faeb18..dec8f56 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.service.in b/units/suspend.service.in
deleted file mode 100644
index 3cf819e..0000000
--- a/units/suspend.service.in
+++ /dev/null
@@ -1,16 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Suspend
-DefaultDependencies=no
-Requires=sleep.target
-After=sleep.target
-
-[Service]
-Type=oneshot
-ExecStart=@rootlibexecdir@/systemd-sleep suspend
diff --git a/units/suspend.target b/units/suspend.target
index eaf79be..83f69f1 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/systemd-halt.service.in b/units/systemd-halt.service.in
new file mode 100644
index 0000000..b746d1e
--- /dev/null
+++ b/units/systemd-halt.service.in
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Halt
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=@SYSTEMCTL@ --force halt
diff --git a/units/systemd-hibernate.service.in b/units/systemd-hibernate.service.in
new file mode 100644
index 0000000..6dba653
--- /dev/null
+++ b/units/systemd-hibernate.service.in
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Hibernate
+DefaultDependencies=no
+Requires=sleep.target
+After=sleep.target
+
+[Service]
+Type=oneshot
+ExecStart=@rootlibexecdir@/systemd-sleep hibernate
diff --git a/units/systemd-kexec.service.in b/units/systemd-kexec.service.in
new file mode 100644
index 0000000..17d0344
--- /dev/null
+++ b/units/systemd-kexec.service.in
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Reboot via kexec
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=@SYSTEMCTL@ --force kexec
diff --git a/units/systemd-poweroff.service.in b/units/systemd-poweroff.service.in
new file mode 100644
index 0000000..851a0f9
--- /dev/null
+++ b/units/systemd-poweroff.service.in
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Power-Off
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=@SYSTEMCTL@ --force poweroff
diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in
index 8ea5750..e9156ef 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 05b3c61..3444d4c 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/systemd-reboot.service.in b/units/systemd-reboot.service.in
new file mode 100644
index 0000000..e6a8aab
--- /dev/null
+++ b/units/systemd-reboot.service.in
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Reboot
+DefaultDependencies=no
+Requires=shutdown.target umount.target final.target
+After=shutdown.target umount.target final.target
+
+[Service]
+Type=oneshot
+ExecStart=@SYSTEMCTL@ --force reboot
diff --git a/units/systemd-suspend.service.in b/units/systemd-suspend.service.in
new file mode 100644
index 0000000..3cf819e
--- /dev/null
+++ b/units/systemd-suspend.service.in
@@ -0,0 +1,16 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Suspend
+DefaultDependencies=no
+Requires=sleep.target
+After=sleep.target
+
+[Service]
+Type=oneshot
+ExecStart=@rootlibexecdir@/systemd-sleep suspend
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 6666dbd..7b6fbad 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 5b726c3..8615d15 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 eeb62b3..41a74f5 100644
--- a/units/user/.gitignore
+++ b/units/user/.gitignore
@@ -1 +1 @@
-exit.service
+/systemd-exit.service
diff --git a/units/user/exit.service.in b/units/user/exit.service.in
deleted file mode 100644
index a114f6c..0000000
--- a/units/user/exit.service.in
+++ /dev/null
@@ -1,17 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=Exit the Session
-Documentation=man:systemd.special(7)
-DefaultDependencies=no
-Requires=shutdown.target
-After=shutdown.target
-
-[Service]
-Type=oneshot
-ExecStart=@SYSTEMCTL@ --user --force exit
diff --git a/units/user/exit.target b/units/user/exit.target
index 539e03a..b0ad24c 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/systemd-exit.service.in b/units/user/systemd-exit.service.in
new file mode 100644
index 0000000..a114f6c
--- /dev/null
+++ b/units/user/systemd-exit.service.in
@@ -0,0 +1,17 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=Exit the Session
+Documentation=man:systemd.special(7)
+DefaultDependencies=no
+Requires=shutdown.target
+After=shutdown.target
+
+[Service]
+Type=oneshot
+ExecStart=@SYSTEMCTL@ --user --force exit

commit 93a1d735aca5584a005d851f12cb0b8c7bb5e5ca
Author: Lennart Poettering <lennart at poettering.net>
Date:   Mon Jun 25 13:47:45 2012 +0200

    units: rename fsck at .service to systemd-fsck at .service
    
    The rule is that units that encapsulate our own code are prefixed with
    "systemd-". Since the fsck units invoke our own code, hence add the
    missing prefix. Since a long long time the fsck units didn't invoke the
    naked fsck binaries anymore, and it is unlikely that this well ever
    change. On the opposite: the code in systemd-fsck will probably get more
    complex over time to handle fsck progress to plymouth forwarding.
    
    Same for quotacheck (but not quotaon!)

diff --git a/Makefile.am b/Makefile.am
index 09ea5ec..c3e3ad2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -334,8 +334,8 @@ nodist_systemunit_DATA = \
 	units/poweroff.service \
 	units/reboot.service \
 	units/kexec.service \
-	units/fsck at .service \
-	units/fsck-root.service \
+	units/systemd-fsck at .service \
+	units/systemd-fsck-root.service \
 	units/rescue.service \
 	units/suspend.service \
 	units/user at .service \
@@ -374,8 +374,8 @@ EXTRA_DIST += \
 	units/reboot.service.in \
 	units/kexec.service.in \
 	units/user/exit.service.in \
-	units/fsck at .service.in \
-	units/fsck-root.service.in \
+	units/systemd-fsck at .service.in \
+	units/systemd-fsck-root.service.in \
 	units/user at .service.in \
 	units/systemd-udev.service \
 	units/systemd-udev-trigger.service \
@@ -2442,10 +2442,10 @@ rootlibexec_PROGRAMS += \
 	systemd-quotacheck
 
 nodist_systemunit_DATA += \
-	units/quotacheck.service
+	units/systemd-quotacheck.service
 
 EXTRA_DIST += \
-	units/quotacheck.service.in
+	units/systemd-quotacheck.service.in
 
 systemd_quotacheck_SOURCES = \
 	src/quotacheck/quotacheck.c
@@ -3192,10 +3192,10 @@ systemd-install-data-hook:
 		$(LN_S) ../systemd-update-utmp-shutdown.service systemd-update-utmp-shutdown.service )
 	( cd $(DESTDIR)$(systemunitdir)/local-fs.target.wants && \
 		rm -f systemd-remount-fs.service \
-			fsck-root.service \
+			systemd-fsck-root.service \
 			tmp.mount && \
 		$(LN_S) ../systemd-remount-fs.service systemd-remount-fs.service && \
-		$(LN_S) ../fsck-root.service fsck-root.service && \
+		$(LN_S) ../systemd-fsck-root.service systemd-fsck-root.service && \
 		$(LN_S) ../tmp.mount tmp.mount )
 	( cd $(DESTDIR)$(userunitdir) && \
 		rm -f shutdown.target sockets.target bluetooth.target printer.target sound.target && \
diff --git a/man/kernel-command-line.xml b/man/kernel-command-line.xml
index 3655b51..3efd59d 100644
--- a/man/kernel-command-line.xml
+++ b/man/kernel-command-line.xml
@@ -160,7 +160,7 @@
                                         <para>Parameter understood by
                                         the file system checker
                                         services. For details see
-                                        <citerefentry><refentrytitle>fsck-root.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+                                        <citerefentry><refentrytitle>systemd-fsck-root.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
                                 </listitem>
                         </varlistentry>
 
@@ -171,7 +171,7 @@
                                         <para>Parameter understood by
                                         the file quota checker
                                         service. For details see
-                                        <citerefentry><refentrytitle>quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
+                                        <citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>.</para>
                                 </listitem>
                         </varlistentry>
 
@@ -280,8 +280,8 @@
                           <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>bootparam</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>dracut.cmdline</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>fsck-root.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-                          <citerefentry><refentrytitle>quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-fsck-root.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
+                          <citerefentry><refentrytitle>systemd-quotacheck.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd-journald.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd-vconsole-setup.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
                           <citerefentry><refentrytitle>systemd-udevd.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
diff --git a/src/core/mount.c b/src/core/mount.c
index 3f8cf8a..6b35886 100644
--- a/src/core/mount.c
+++ b/src/core/mount.c
@@ -366,7 +366,7 @@ static int mount_add_device_links(Mount *m) {
                 /* Let's add in the fsck service */
 
                 /* aka SPECIAL_FSCK_SERVICE */
-                name = unit_name_from_path_instance("fsck", p->what, ".service");
+                name = unit_name_from_path_instance("systemd-fsck", p->what, ".service");
                 if (!name)
                         return -ENOMEM;
 
diff --git a/src/core/special.h b/src/core/special.h
index bc9b330..f71f076 100644
--- a/src/core/special.h
+++ b/src/core/special.h
@@ -64,8 +64,8 @@
 #define SPECIAL_HTTP_DAEMON_TARGET "http-daemon.target"
 
 /* Magic early boot services */
-#define SPECIAL_FSCK_SERVICE "fsck at .service"
-#define SPECIAL_QUOTACHECK_SERVICE "quotacheck.service"
+#define SPECIAL_FSCK_SERVICE "systemd-fsck at .service"
+#define SPECIAL_QUOTACHECK_SERVICE "systemd-quotacheck.service"
 #define SPECIAL_QUOTAON_SERVICE "quotaon.service"
 #define SPECIAL_REMOUNT_FS_SERVICE "systemd-remount-fs.service"
 
diff --git a/units/.gitignore b/units/.gitignore
index bcbff33..6808d1c 100644
--- a/units/.gitignore
+++ b/units/.gitignore
@@ -12,9 +12,9 @@ systemd-sysctl.service
 systemd-ask-password-console.service
 rescue.service
 systemd-ask-password-wall.service
-quotacheck.service
-fsck at .service
-fsck-root.service
+/systemd-quotacheck.service
+/systemd-fsck at .service
+/systemd-fsck-root.service
 systemd-tmpfiles-clean.service
 systemd-tmpfiles-setup.service
 halt.service
diff --git a/units/fsck-root.service.in b/units/fsck-root.service.in
deleted file mode 100644
index 517dee7..0000000
--- a/units/fsck-root.service.in
+++ /dev/null
@@ -1,24 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=File System Check on Root Device
-DefaultDependencies=no
-After=systemd-readahead-collect.service systemd-readahead-replay.service
-Before=local-fs.target shutdown.target
-
-# Dracut informs us with this flag file if the root fsck was already run
-ConditionPathExists=!/run/initramfs/root-fsck
-ConditionPathIsReadWrite=!/
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=@rootlibexecdir@/systemd-fsck
-StandardOutput=journal+console
-FsckPassNo=1
-TimeoutSec=0
diff --git a/units/fsck at .service.in b/units/fsck at .service.in
deleted file mode 100644
index 4c59577..0000000
--- a/units/fsck at .service.in
+++ /dev/null
@@ -1,20 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=File System Check on %f
-DefaultDependencies=no
-BindTo=%i.device
-After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
-Before=shutdown.target
-
-[Service]
-Type=oneshot
-RemainAfterExit=no
-ExecStart=@rootlibexecdir@/systemd-fsck %f
-StandardOutput=journal+console
-TimeoutSec=0
diff --git a/units/quotacheck.service.in b/units/quotacheck.service.in
deleted file mode 100644
index d3343df..0000000
--- a/units/quotacheck.service.in
+++ /dev/null
@@ -1,19 +0,0 @@
-#  This file is part of systemd.
-#
-#  systemd is free software; you can redistribute it and/or modify it
-#  under the terms of the GNU Lesser General Public License as published by
-#  the Free Software Foundation; either version 2.1 of the License, or
-#  (at your option) any later version.
-
-[Unit]
-Description=File System Quota Check
-DefaultDependencies=no
-After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
-Before=local-fs.target shutdown.target
-ConditionPathExists=/sbin/quotacheck
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@rootlibexecdir@/systemd-quotacheck
-TimeoutSec=0
diff --git a/units/quotaon.service b/units/quotaon.service
index f90a7fe..b8df87e 100644
--- a/units/quotaon.service
+++ b/units/quotaon.service
@@ -8,7 +8,7 @@
 [Unit]
 Description=Enable File System Quotas
 DefaultDependencies=no
-After=systemd-readahead-collect.service systemd-readahead-replay.service quotacheck.service
+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-quotacheck.service
 Before=local-fs.target shutdown.target
 ConditionPathExists=/sbin/quotaon
 
diff --git a/units/systemd-fsck-root.service.in b/units/systemd-fsck-root.service.in
new file mode 100644
index 0000000..517dee7
--- /dev/null
+++ b/units/systemd-fsck-root.service.in
@@ -0,0 +1,24 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=File System Check on Root Device
+DefaultDependencies=no
+After=systemd-readahead-collect.service systemd-readahead-replay.service
+Before=local-fs.target shutdown.target
+
+# Dracut informs us with this flag file if the root fsck was already run
+ConditionPathExists=!/run/initramfs/root-fsck
+ConditionPathIsReadWrite=!/
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=@rootlibexecdir@/systemd-fsck
+StandardOutput=journal+console
+FsckPassNo=1
+TimeoutSec=0
diff --git a/units/systemd-fsck at .service.in b/units/systemd-fsck at .service.in
new file mode 100644
index 0000000..4c59577
--- /dev/null
+++ b/units/systemd-fsck at .service.in
@@ -0,0 +1,20 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=File System Check on %f
+DefaultDependencies=no
+BindTo=%i.device
+After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device
+Before=shutdown.target
+
+[Service]
+Type=oneshot
+RemainAfterExit=no
+ExecStart=@rootlibexecdir@/systemd-fsck %f
+StandardOutput=journal+console
+TimeoutSec=0
diff --git a/units/systemd-quotacheck.service.in b/units/systemd-quotacheck.service.in
new file mode 100644
index 0000000..d3343df
--- /dev/null
+++ b/units/systemd-quotacheck.service.in
@@ -0,0 +1,19 @@
+#  This file is part of systemd.
+#
+#  systemd is free software; you can redistribute it and/or modify it
+#  under the terms of the GNU Lesser General Public License as published by
+#  the Free Software Foundation; either version 2.1 of the License, or
+#  (at your option) any later version.
+
+[Unit]
+Description=File System Quota Check
+DefaultDependencies=no
+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
+Before=local-fs.target shutdown.target
+ConditionPathExists=/sbin/quotacheck
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=@rootlibexecdir@/systemd-quotacheck
+TimeoutSec=0
diff --git a/units/systemd-remount-fs.service.in b/units/systemd-remount-fs.service.in
index 0524de8..cddb0a1 100644
--- a/units/systemd-remount-fs.service.in
+++ b/units/systemd-remount-fs.service.in
@@ -10,7 +10,7 @@ Description=Remount Root and Kernel File Systems
 Documentation=man:systemd-remount-fs.service(8)
 DefaultDependencies=no
 Conflicts=shutdown.target
-After=systemd-readahead-collect.service systemd-readahead-replay.service fsck-root.service
+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-fsck-root.service
 Before=local-fs-pre.target local-fs.target shutdown.target
 Wants=local-fs-pre.target
 ConditionPathExists=/etc/fstab

