[systemd-commits] units/arch units/fedora units/gentoo units/suse

[Lennart Poettering]

 units/arch/halt.service       |    5 ++---
 units/arch/poweroff.service   |    5 ++---
 units/arch/reboot.service     |    5 ++---
 units/arch/sysinit.service    |    3 +--
 units/fedora/prefdm.service   |    2 +-
 units/gentoo/halt.service     |    5 ++---
 units/gentoo/poweroff.service |    5 ++---
 units/gentoo/reboot.service   |    5 ++---
 units/suse/halt.service       |    5 ++---
 units/suse/poweroff.service   |    5 ++---
 units/suse/reboot.service     |    5 ++---
 11 files changed, 20 insertions(+), 30 deletions(-)

New commits:
commit 172f6478b3d70f03e4712d62bc31d9c604e852b4
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Jul 13 21:30:38 2010 +0200

    units: update other distro units to recent fedora changes

diff --git a/units/arch/halt.service b/units/arch/halt.service
index 87224e3..2017d91 100644
--- a/units/arch/halt.service
+++ b/units/arch/halt.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Halt
 DefaultDependencies=no
-Requires=shutdown.target
-After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target
 
 [Service]
 Type=finish
diff --git a/units/arch/poweroff.service b/units/arch/poweroff.service
index ffa592c..04922db 100644
--- a/units/arch/poweroff.service
+++ b/units/arch/poweroff.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Power-Off
 DefaultDependencies=no
-Requires=shutdown.target
-After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target
 
 [Service]
 Type=finish
diff --git a/units/arch/reboot.service b/units/arch/reboot.service
index 934903d..8d1e90f 100644
--- a/units/arch/reboot.service
+++ b/units/arch/reboot.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Reboot
 DefaultDependencies=no
-Requires=shutdown.target
-After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target
 
 [Service]
 Type=finish
diff --git a/units/arch/sysinit.service b/units/arch/sysinit.service
index 1a19baf..880decc 100644
--- a/units/arch/sysinit.service
+++ b/units/arch/sysinit.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=System Initialization
 DefaultDependencies=no
-Before=local-fs.target remote-fs.target swap.target sockets.target
 Conflicts=shutdown.target
-Before=shutdown.target
+Before=shutdown.target emergency.service emergency.target
 
 [Service]
 ExecStart=/etc/rc.sysinit
diff --git a/units/fedora/prefdm.service b/units/fedora/prefdm.service
index 89a96be..79a2af3 100644
--- a/units/fedora/prefdm.service
+++ b/units/fedora/prefdm.service
@@ -7,7 +7,7 @@
 
 [Unit]
 Description=Display Manager
-After=syslog.target dbus.target haldaemon.service
+After=syslog.target haldaemon.service
 
 [Service]
 ExecStart=/etc/X11/prefdm -nodaemon
diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service
index 19ead8a..0b4de11 100644
--- a/units/gentoo/halt.service
+++ b/units/gentoo/halt.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Halt
 DefaultDependencies=no
-Requires=shutdown.target killall.service
-After=shutdown.target killall.service
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service
 
 [Service]
 Type=finish
diff --git a/units/gentoo/poweroff.service b/units/gentoo/poweroff.service
index 9ceb205..f4b8fbf 100644
--- a/units/gentoo/poweroff.service
+++ b/units/gentoo/poweroff.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Power-Off
 DefaultDependencies=no
-Requires=shutdown.target killall.service
-After=shutdown.target killall.service
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service
 
 [Service]
 Type=finish
diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service
index c223e6c..7492aae 100644
--- a/units/gentoo/reboot.service
+++ b/units/gentoo/reboot.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Reboot
 DefaultDependencies=no
-Requires=shutdown.target killall.service
-After=shutdown.target killall.service
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+Requires=shutdown.target umount.target killall.service
+After=shutdown.target umount.target killall.service
 
 [Service]
 Type=finish
diff --git a/units/suse/halt.service b/units/suse/halt.service
index 5f42ac6..75e3063 100644
--- a/units/suse/halt.service
+++ b/units/suse/halt.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Halt
 DefaultDependencies=no
-Requires=shutdown.target
-After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target
 
 [Service]
 Type=finish
diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service
index 93a9da5..f9f7b56 100644
--- a/units/suse/poweroff.service
+++ b/units/suse/poweroff.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Power-Off
 DefaultDependencies=no
-Requires=shutdown.target
-After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target
 
 [Service]
 Type=finish
diff --git a/units/suse/reboot.service b/units/suse/reboot.service
index c3526b3..5fc24d1 100644
--- a/units/suse/reboot.service
+++ b/units/suse/reboot.service
@@ -8,9 +8,8 @@
 [Unit]
 Description=Reboot
 DefaultDependencies=no
-Requires=shutdown.target
-After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
+Requires=shutdown.target umount.target
+After=shutdown.target umount.target
 
 [Service]
 Type=finish