From 172f6478b3d70f03e4712d62bc31d9c604e852b4 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 13 Jul 2010 21:30:38 +0200 Subject: units: update other distro units to recent fedora changes --- units/arch/halt.service | 5 ++--- units/arch/poweroff.service | 5 ++--- units/arch/reboot.service | 5 ++--- units/arch/sysinit.service | 3 +-- 4 files changed, 7 insertions(+), 11 deletions(-) (limited to 'units/arch') diff --git a/units/arch/halt.service b/units/arch/halt.service index 87224e34b6..2017d91bf5 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 ffa592c8f6..04922db315 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 934903dc6b..8d1e90f5aa 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 1a19baf2f6..880deccf9c 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 -- cgit v1.2.3-54-g00ecf