From: Lennart Poettering Date: Sat, 10 Jul 2010 02:52:31 +0000 (+0200) Subject: units: turn shutdown dependencies from Requires into Wants to make things a bit more... X-Git-Tag: v3~58 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b827a9f97dcc88f4b9e23d656d7325455eb33848;p=thirdparty%2Fsystemd.git units: turn shutdown dependencies from Requires into Wants to make things a bit more robust --- diff --git a/units/arch/halt.service b/units/arch/halt.service index 87224e34b61..190e4fee894 100644 --- a/units/arch/halt.service +++ b/units/arch/halt.service @@ -8,7 +8,7 @@ [Unit] Description=Halt DefaultDependencies=no -Requires=shutdown.target +Wants=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 diff --git a/units/arch/poweroff.service b/units/arch/poweroff.service index ffa592c8f67..0b1ee89aa67 100644 --- a/units/arch/poweroff.service +++ b/units/arch/poweroff.service @@ -8,7 +8,7 @@ [Unit] Description=Power-Off DefaultDependencies=no -Requires=shutdown.target +Wants=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 diff --git a/units/arch/reboot.service b/units/arch/reboot.service index 934903dc6b5..274f4075f2d 100644 --- a/units/arch/reboot.service +++ b/units/arch/reboot.service @@ -8,7 +8,7 @@ [Unit] Description=Reboot DefaultDependencies=no -Requires=shutdown.target +Wants=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 diff --git a/units/fedora/halt.service b/units/fedora/halt.service index b957a3fe302..0c0fa5fa380 100644 --- a/units/fedora/halt.service +++ b/units/fedora/halt.service @@ -8,7 +8,7 @@ [Unit] Description=Halt DefaultDependencies=no -Requires=shutdown.target killall.service +Wants=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 diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service index 76d030c041c..913edc489fe 100644 --- a/units/fedora/poweroff.service +++ b/units/fedora/poweroff.service @@ -8,7 +8,7 @@ [Unit] Description=Power-Off DefaultDependencies=no -Requires=shutdown.target killall.service +Wants=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 diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service index 6a93c0b5575..c81b13ecd9f 100644 --- a/units/fedora/reboot.service +++ b/units/fedora/reboot.service @@ -8,7 +8,7 @@ [Unit] Description=Reboot DefaultDependencies=no -Requires=shutdown.target killall.service +Wants=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 diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service index 19ead8a315a..28db813fb37 100644 --- a/units/gentoo/halt.service +++ b/units/gentoo/halt.service @@ -8,7 +8,7 @@ [Unit] Description=Halt DefaultDependencies=no -Requires=shutdown.target killall.service +Wants=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 diff --git a/units/gentoo/poweroff.service b/units/gentoo/poweroff.service index 9ceb205b051..da6f48f7491 100644 --- a/units/gentoo/poweroff.service +++ b/units/gentoo/poweroff.service @@ -8,7 +8,7 @@ [Unit] Description=Power-Off DefaultDependencies=no -Requires=shutdown.target killall.service +Wants=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 diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service index c223e6c26f4..a0f35753855 100644 --- a/units/gentoo/reboot.service +++ b/units/gentoo/reboot.service @@ -8,7 +8,7 @@ [Unit] Description=Reboot DefaultDependencies=no -Requires=shutdown.target killall.service +Wants=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 diff --git a/units/session/exit.service.in b/units/session/exit.service.in index 1f515a75ced..3e5b5bff71e 100644 --- a/units/session/exit.service.in +++ b/units/session/exit.service.in @@ -1,7 +1,7 @@ [Unit] Description=Exit DefaultDependencies=no -Requires=shutdown.target +Wants=shutdown.target After=shutdown.target [Service] diff --git a/units/suse/halt.service b/units/suse/halt.service index 5f42ac691f7..00bbfa93f49 100644 --- a/units/suse/halt.service +++ b/units/suse/halt.service @@ -8,7 +8,7 @@ [Unit] Description=Halt DefaultDependencies=no -Requires=shutdown.target +Wants=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 diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service index 93a9da502ad..e9aff275d44 100644 --- a/units/suse/poweroff.service +++ b/units/suse/poweroff.service @@ -8,7 +8,7 @@ [Unit] Description=Power-Off DefaultDependencies=no -Requires=shutdown.target +Wants=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 diff --git a/units/suse/reboot.service b/units/suse/reboot.service index c3526b3035c..e9b76b61db3 100644 --- a/units/suse/reboot.service +++ b/units/suse/reboot.service @@ -8,7 +8,7 @@ [Unit] Description=Reboot DefaultDependencies=no -Requires=shutdown.target +Wants=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