summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-07-13 21:30:38 +0200
committerLennart Poettering <lennart@poettering.net>2010-07-13 21:30:38 +0200
commit172f6478b3d70f03e4712d62bc31d9c604e852b4 (patch)
treea6118c457a5dae988cfae348857e261a40e49a4c
parent6f28c033ec506847b3bfa4efaf52478120c36946 (diff)
units: update other distro units to recent fedora changes
-rw-r--r--units/arch/halt.service5
-rw-r--r--units/arch/poweroff.service5
-rw-r--r--units/arch/reboot.service5
-rw-r--r--units/arch/sysinit.service3
-rw-r--r--units/fedora/prefdm.service2
-rw-r--r--units/gentoo/halt.service5
-rw-r--r--units/gentoo/poweroff.service5
-rw-r--r--units/gentoo/reboot.service5
-rw-r--r--units/suse/halt.service5
-rw-r--r--units/suse/poweroff.service5
-rw-r--r--units/suse/reboot.service5
11 files changed, 20 insertions, 30 deletions
diff --git a/units/arch/halt.service b/units/arch/halt.service
index 87224e34b..2017d91bf 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 ffa592c8f..04922db31 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 934903dc6..8d1e90f5a 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 1a19baf2f..880deccf9 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 89a96be1c..79a2af39d 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 19ead8a31..0b4de1148 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 9ceb205b0..f4b8fbf12 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 c223e6c26..7492aaedb 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 5f42ac691..75e30632c 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 93a9da502..f9f7b56dc 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 c3526b303..5fc24d1c8 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