[systemd-devel] [PATCH 3/4] fix to not rely on (halt|reboot|poweroff).service anymore

[Gustavo Sverzut Barbieri]

---
 units/halt.target                             |    2 --
 units/hwclock-save.service                    |    2 +-
 units/poweroff.target                         |    2 --
 units/reboot.target                           |    2 --
 units/systemd-random-seed-save.service.in     |    2 +-
 units/systemd-update-utmp-runlevel.service.in |    2 +-
 units/systemd-update-utmp-shutdown.service.in |    2 +-
 units/tmpwatch.service                        |    2 +-
 8 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/units/halt.target b/units/halt.target
index 04b42cd..31b8bae 100644
--- a/units/halt.target
+++ b/units/halt.target
@@ -10,8 +10,6 @@
 [Unit]
 Description=Halt
 DefaultDependencies=no
-Requires=halt.service
-After=halt.service
 AllowIsolate=yes
 
 [Install]
diff --git a/units/hwclock-save.service b/units/hwclock-save.service
index 067196f..567348c 100644
--- a/units/hwclock-save.service
+++ b/units/hwclock-save.service
@@ -8,7 +8,7 @@
 [Unit]
 Description=Update RTC With System Clock
 DefaultDependencies=no
-Before=poweroff.service reboot.service halt.service killall.service
+Before=poweroff.target reboot.target halt.target
 
 [Service]
 Type=oneshot
diff --git a/units/poweroff.target b/units/poweroff.target
index 975b088..b0c8101 100644
--- a/units/poweroff.target
+++ b/units/poweroff.target
@@ -11,8 +11,6 @@
 Description=Power-Off
 DefaultDependencies=no
 Names=runlevel0.target
-Requires=poweroff.service
-After=poweroff.service
 AllowIsolate=yes
 
 [Install]
diff --git a/units/reboot.target b/units/reboot.target
index 2cd46a0..813768a 100644
--- a/units/reboot.target
+++ b/units/reboot.target
@@ -11,8 +11,6 @@
 Description=Reboot
 DefaultDependencies=no
 Names=runlevel6.target
-Requires=reboot.service
-After=reboot.service
 AllowIsolate=yes
 
 [Install]
diff --git a/units/systemd-random-seed-save.service.in b/units/systemd-random-seed-save.service.in
index 7cfd2c0..c44d814 100644
--- a/units/systemd-random-seed-save.service.in
+++ b/units/systemd-random-seed-save.service.in
@@ -8,7 +8,7 @@
 [Unit]
 Description=Save Random Seed
 DefaultDependencies=no
-Before=poweroff.service reboot.service halt.service killall.service
+Before=poweroff.target reboot.target halt.target
 Conflicts=systemd-random-seed-load.service
 
 [Service]
diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
index 0cbde37..6fee3ee 100644
--- a/units/systemd-update-utmp-runlevel.service.in
+++ b/units/systemd-update-utmp-runlevel.service.in
@@ -10,7 +10,7 @@ Description=Notify Audit System and Update UTMP about System Runlevel Changes
 DefaultDependencies=no
 Wants=local-fs.target sysinit.target
 After=local-fs.target sysinit.target auditd.service runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
-Before=poweroff.service reboot.service halt.service killall.service
+Before=poweroff.target reboot.target halt.target
 
 [Service]
 Type=oneshot
diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
index 0b4fe92..350367d 100644
--- a/units/systemd-update-utmp-shutdown.service.in
+++ b/units/systemd-update-utmp-shutdown.service.in
@@ -10,7 +10,7 @@ Description=Notify Audit System and Update UTMP about System Shutdown
 DefaultDependencies=no
 Wants=local-fs.target sysinit.target
 After=local-fs.target sysinit.target auditd.service systemd-update-utmp-runlevel.service
-Before=poweroff.service reboot.service halt.service killall.service
+Before=poweroff.target reboot.target halt.target
 
 [Service]
 Type=oneshot
diff --git a/units/tmpwatch.service b/units/tmpwatch.service
index 5cc0b6b..e0d8198 100644
--- a/units/tmpwatch.service
+++ b/units/tmpwatch.service
@@ -10,7 +10,7 @@ Description=Cleanup of Temporary Directories
 DefaultDependencies=no
 Wants=local-fs.target
 After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target
-Before=poweroff.service reboot.service halt.service killall.service
+Before=poweroff.target reboot.target halt.target
 
 [Service]
 Type=oneshot
-- 
1.7.2.2