chiark / gitweb /
units: update other distro units to recent fedora changes
authorLennart Poettering <lennart@poettering.net>
Tue, 13 Jul 2010 19:30:38 +0000 (21:30 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 13 Jul 2010 19:30:38 +0000 (21:30 +0200)
units/arch/halt.service
units/arch/poweroff.service
units/arch/reboot.service
units/arch/sysinit.service
units/fedora/prefdm.service
units/gentoo/halt.service
units/gentoo/poweroff.service
units/gentoo/reboot.service
units/suse/halt.service
units/suse/poweroff.service
units/suse/reboot.service

index 87224e3..2017d91 100644 (file)
@@ -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
index ffa592c..04922db 100644 (file)
@@ -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
index 934903d..8d1e90f 100644 (file)
@@ -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
index 1a19baf..880decc 100644 (file)
@@ -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
index 89a96be..79a2af3 100644 (file)
@@ -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
index 19ead8a..0b4de11 100644 (file)
@@ -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
index 9ceb205..f4b8fbf 100644 (file)
@@ -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
index c223e6c..7492aae 100644 (file)
@@ -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
index 5f42ac6..75e3063 100644 (file)
@@ -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
index 93a9da5..f9f7b56 100644 (file)
@@ -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
index c3526b3..5fc24d1 100644 (file)
@@ -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