chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3f6c78d
)
units: turn shutdown dependencies from Requires into Wants to make things a bit more...
author
Lennart Poettering
<lennart@poettering.net>
Sat, 10 Jul 2010 02:52:31 +0000
(
04:52
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sat, 10 Jul 2010 02:52:31 +0000
(
04:52
+0200)
13 files changed:
units/arch/halt.service
patch
|
blob
|
history
units/arch/poweroff.service
patch
|
blob
|
history
units/arch/reboot.service
patch
|
blob
|
history
units/fedora/halt.service
patch
|
blob
|
history
units/fedora/poweroff.service
patch
|
blob
|
history
units/fedora/reboot.service
patch
|
blob
|
history
units/gentoo/halt.service
patch
|
blob
|
history
units/gentoo/poweroff.service
patch
|
blob
|
history
units/gentoo/reboot.service
patch
|
blob
|
history
units/session/exit.service.in
patch
|
blob
|
history
units/suse/halt.service
patch
|
blob
|
history
units/suse/poweroff.service
patch
|
blob
|
history
units/suse/reboot.service
patch
|
blob
|
history
diff --git
a/units/arch/halt.service
b/units/arch/halt.service
index 87224e34b6142ab4a0c8627afadbac7a9e4aa215..190e4fee894b7aba630df3fd3b37f7117256f7f8 100644
(file)
--- a/
units/arch/halt.service
+++ b/
units/arch/halt.service
@@
-8,7
+8,7
@@
[Unit]
Description=Halt
DefaultDependencies=no
[Unit]
Description=Halt
DefaultDependencies=no
-
Require
s=shutdown.target
+
Want
s=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
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 ffa592c8f67c7196a5f472fe09d13a9069b97b29..0b1ee89aa679a65f7cbea3f5ae02e713f43a7ef5 100644
(file)
--- a/
units/arch/poweroff.service
+++ b/
units/arch/poweroff.service
@@
-8,7
+8,7
@@
[Unit]
Description=Power-Off
DefaultDependencies=no
[Unit]
Description=Power-Off
DefaultDependencies=no
-
Require
s=shutdown.target
+
Want
s=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
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 934903dc6b5b3c4df44efe28f30e6c5311fc2766..274f4075f2db61d297ce51c23a269e31c890c4bf 100644
(file)
--- a/
units/arch/reboot.service
+++ b/
units/arch/reboot.service
@@
-8,7
+8,7
@@
[Unit]
Description=Reboot
DefaultDependencies=no
[Unit]
Description=Reboot
DefaultDependencies=no
-
Require
s=shutdown.target
+
Want
s=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
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 b957a3fe302f4ee4e6dfcab5a25b229a8f236354..0c0fa5fa380ac7816ccc8a0d681e08ca7d7aa338 100644
(file)
--- a/
units/fedora/halt.service
+++ b/
units/fedora/halt.service
@@
-8,7
+8,7
@@
[Unit]
Description=Halt
DefaultDependencies=no
[Unit]
Description=Halt
DefaultDependencies=no
-
Require
s=shutdown.target killall.service
+
Want
s=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
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 76d030c041c2cf15e51ab6ce184d87629aac183f..913edc489fefce6b413a571db7b2c130800522cb 100644
(file)
--- a/
units/fedora/poweroff.service
+++ b/
units/fedora/poweroff.service
@@
-8,7
+8,7
@@
[Unit]
Description=Power-Off
DefaultDependencies=no
[Unit]
Description=Power-Off
DefaultDependencies=no
-
Require
s=shutdown.target killall.service
+
Want
s=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
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 6a93c0b5575c29d6d02b7d04ffe50ba4219fde8d..c81b13ecd9f38ebb2772c848a41b9fcd6b2b23ff 100644
(file)
--- a/
units/fedora/reboot.service
+++ b/
units/fedora/reboot.service
@@
-8,7
+8,7
@@
[Unit]
Description=Reboot
DefaultDependencies=no
[Unit]
Description=Reboot
DefaultDependencies=no
-
Require
s=shutdown.target killall.service
+
Want
s=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
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 19ead8a315a3dac732b3639a3edbcbe84111b7af..28db813fb37772f6d1f04fe530d4fab77ce2f2d6 100644
(file)
--- a/
units/gentoo/halt.service
+++ b/
units/gentoo/halt.service
@@
-8,7
+8,7
@@
[Unit]
Description=Halt
DefaultDependencies=no
[Unit]
Description=Halt
DefaultDependencies=no
-
Require
s=shutdown.target killall.service
+
Want
s=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
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 9ceb205b05195c08a227b7199f920887f050c5de..da6f48f74913c7f8b59dc74b97ae4c2a5b81a825 100644
(file)
--- a/
units/gentoo/poweroff.service
+++ b/
units/gentoo/poweroff.service
@@
-8,7
+8,7
@@
[Unit]
Description=Power-Off
DefaultDependencies=no
[Unit]
Description=Power-Off
DefaultDependencies=no
-
Require
s=shutdown.target killall.service
+
Want
s=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
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 c223e6c26f4390171cffdfce0c6539599d6ba2f8..a0f357538552f5abbfcc81f1bb11557ed0a59a0e 100644
(file)
--- a/
units/gentoo/reboot.service
+++ b/
units/gentoo/reboot.service
@@
-8,7
+8,7
@@
[Unit]
Description=Reboot
DefaultDependencies=no
[Unit]
Description=Reboot
DefaultDependencies=no
-
Require
s=shutdown.target killall.service
+
Want
s=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
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 1f515a75cedbf15701b9a61737cc3be85d0bfcb0..3e5b5bff71efa25332fc289aedd2dfd01ba820ca 100644
(file)
--- a/
units/session/exit.service.in
+++ b/
units/session/exit.service.in
@@
-1,7
+1,7
@@
[Unit]
Description=Exit
DefaultDependencies=no
[Unit]
Description=Exit
DefaultDependencies=no
-
Require
s=shutdown.target
+
Want
s=shutdown.target
After=shutdown.target
[Service]
After=shutdown.target
[Service]
diff --git
a/units/suse/halt.service
b/units/suse/halt.service
index 5f42ac691f72557c78ccbf22b9648a7b84188c65..00bbfa93f49f81320c1b07995af8588367645e71 100644
(file)
--- a/
units/suse/halt.service
+++ b/
units/suse/halt.service
@@
-8,7
+8,7
@@
[Unit]
Description=Halt
DefaultDependencies=no
[Unit]
Description=Halt
DefaultDependencies=no
-
Require
s=shutdown.target
+
Want
s=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
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 93a9da502ad839bd2d3c8b563e9ebcbd4c18aa36..e9aff275d4458cc5296025853fb60ff46fbf5397 100644
(file)
--- a/
units/suse/poweroff.service
+++ b/
units/suse/poweroff.service
@@
-8,7
+8,7
@@
[Unit]
Description=Power-Off
DefaultDependencies=no
[Unit]
Description=Power-Off
DefaultDependencies=no
-
Require
s=shutdown.target
+
Want
s=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
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 c3526b3035c3070f730e9ca531f6c76b94ae6737..e9b76b61db3bfac30dab9fbd6bddb1e1a2587493 100644
(file)
--- a/
units/suse/reboot.service
+++ b/
units/suse/reboot.service
@@
-8,7
+8,7
@@
[Unit]
Description=Reboot
DefaultDependencies=no
[Unit]
Description=Reboot
DefaultDependencies=no
-
Require
s=shutdown.target
+
Want
s=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
After=shutdown.target
Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount