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 c3e3ad280eb23c0bf5ae1689b69bd7f4e1eae79a..7193c86f49f8097b3e0d34d2cb7134e7ff9aa024 100644 (file)
--- 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/systemd-ask-password-wall.service \
        units/systemd-ask-password-console.service \
        units/systemd-sysctl.service \

-       units/halt.service \

        units/emergency.service \
        units/emergency.service \

-       units/hibernate.service \
-       units/poweroff.service \
-       units/reboot.service \
-       units/kexec.service \
-       units/systemd-fsck@.service \
-       units/systemd-fsck-root.service \

        units/rescue.service \
        units/rescue.service \

-       units/suspend.service \

        units/user@.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/systemd-udev.service \
        units/systemd-udev-trigger.service \
        units/systemd-udev-settle.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.target
 
 nodist_userunit_DATA = \

-       units/user/exit.service
+       units/user/systemd-exit.service

 
 EXTRA_DIST += \
        units/getty@.service.m4 \
 
 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/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 \
        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/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
 
        introspect.awk \
        man/custom-html.xsl
 

diff --git a/man/bootup.xml b/man/bootup.xml
index ae84cff0b79d82ba5c049b5652ba2418e24aa3c7..69f9a273b95b003e0e7c12ebcbb8f169acaf1131 100644 (file)
--- 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>
 
                 <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 4321f546987b34fcd629929b7a1f550749707215..fdb2020376cb3dbe22291a30601e6421ae900c62 100644 (file)
--- 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>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>,
                 <filename>getty.target</filename>,
                 <filename>graphical.target</filename>,
                 <filename>hibernate.target</filename>,


@@ -813,7 +813,7 @@
 
                 <variablelist>
                         <varlistentry>
 
                 <variablelist>
                         <varlistentry>

-                                <term><filename>exit.service</filename></term>
+                                <term><filename>exit.target</filename></term>

                                 <listitem>
                                         <para>A special service unit
                                         for shutting down the
                                 <listitem>
                                         <para>A special service unit
                                         for shutting down the

diff --git a/units/.gitignore b/units/.gitignore
index 6808d1c82eb11ffd10dc1a3b5292437bd08d3e86..2193bedf6194d34d2b712008afb3cef0775d2c8c 100644 (file)
--- 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
 /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-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-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
 /systemd-udev-settle.service
 /systemd-udev-trigger.service
 /systemd-udev.service

diff --git a/units/halt.target b/units/halt.target
index 41266b96f0c763fd84aa198fe2f594d87a44ae30..a21d984b265a023d2d7003605a38872f4e259713 100644 (file)
--- a/units/halt.target
+++ b/units/halt.target
@@ -9,8 +9,8 @@
 Description=Halt
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
 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]
 AllowIsolate=yes
 
 [Install]

diff --git a/units/hibernate.target b/units/hibernate.target
index fc8493c2087fec85dc3777ef7d852eb4b0bc7ab2..c56460237da0ce940853db2b7be4eb0010f2d01c 100644 (file)
--- a/units/hibernate.target
+++ b/units/hibernate.target
@@ -9,6 +9,5 @@
 Description=Hibernate
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
 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 be8eafcf1f713521d526b0fbb96a59af4059afc8..90795d0c5a9ee63772be1246c389d96f3a22383e 100644 (file)
--- a/units/kexec.target
+++ b/units/kexec.target
@@ -9,8 +9,8 @@
 Description=Reboot via kexec
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
 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]
 AllowIsolate=yes
 
 [Install]

diff --git a/units/poweroff.target b/units/poweroff.target
index bb60c33dd9dac8fa1ec71160b186fcce1624a0e7..71871033a541febb5cf71c9f44be3ad213052cb9 100644 (file)
--- a/units/poweroff.target
+++ b/units/poweroff.target
@@ -9,8 +9,8 @@
 Description=Power-Off
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
 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]
 AllowIsolate=yes
 
 [Install]

diff --git a/units/reboot.target b/units/reboot.target
index 9faeb1800f57a2d5b1a0a3561dcd361c06656ea5..dec8f5679645de6f25fb0ad5969992b369cdfe8d 100644 (file)
--- a/units/reboot.target
+++ b/units/reboot.target
@@ -9,8 +9,8 @@
 Description=Reboot
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
 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]
 AllowIsolate=yes
 
 [Install]

diff --git a/units/suspend.target b/units/suspend.target
index eaf79bed11a6960e5a938e0e22cf1dbd16a79a3a..83f69f1b545c6480efb91eb119e458018ee92866 100644 (file)
--- a/units/suspend.target
+++ b/units/suspend.target
@@ -9,5 +9,5 @@
 Description=Suspend
 Documentation=man:systemd.special(7)
 DefaultDependencies=no
 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 8ea575035e9fc5cfc5cd2ed52130872c2e0747b3..e9156ef086226c795019698339e4f34e4fb7982a 100644 (file)
--- 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
 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@
 RequiresMountsFor=@RANDOM_SEED@

+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service
+Before=sysinit.target final.target

 
 [Service]
 Type=oneshot
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in
index 05b3c6147181786eeeb20b333cb3449c2f1ef26a..3444d4ce701c7c490656dac6bffe47bd245147c5 100644 (file)
--- 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
 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@
 RequiresMountsFor=@RANDOM_SEED@

+After=systemd-remount-fs.service systemd-random-seed-load.service
+Before=final.target

 
 [Service]
 Type=oneshot
 
 [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 6666dbd7902f0afc27b7140b7ee60572e8407c3c..7b6fbadf1223500d8f3182b9cbf4c5170b675b11 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
index 5b726c3688ef96aa4c07cacff0225588a1c47991..8615d150b5206bb43e6f325c979ef80463b87fc6 100644 (file)
--- 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
 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
 
 [Service]
 Type=oneshot

diff --git a/units/user/.gitignore b/units/user/.gitignore
index eeb62b32ba9587fd5bd30259eff6ce65c4cb1285..41a74f54615c781d3f092816d3be559025739894 100644 (file)
--- 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 539e03a9aa9923f2f31e51ec3b1106e57739c62b..b0ad24c488af82c3388bc6df46b6500e300033f4 100644 (file)
--- 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
 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]
 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