summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-06-02 00:58:10 +0200
committerLennart Poettering <lennart@poettering.net>2010-06-02 00:58:10 +0200
commit9a9a438596e6f57cda87fc7045971197fd2b3078 (patch)
treef7a4c39149f0faf02f404982d3a3d66e3826cd1d
parent65b0095b1c126eee9f8d44f81593edb6ff601356 (diff)
units: tear down sys-kernel-security.automount automount point on shutdown
-rw-r--r--units/fedora/halt.service2
-rw-r--r--units/fedora/poweroff.service2
-rw-r--r--units/fedora/reboot.service2
l---------units/gentoo/Makefile1
-rw-r--r--units/gentoo/halt.service2
-rw-r--r--units/gentoo/poweroff.service2
-rw-r--r--units/gentoo/reboot.service2
l---------units/suse/Makefile1
-rw-r--r--units/suse/halt.service2
-rw-r--r--units/suse/poweroff.service2
-rw-r--r--units/suse/reboot.service2
11 files changed, 11 insertions, 9 deletions
diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index ff498e4375..50373d48b6 100644
--- a/units/fedora/halt.service
+++ b/units/fedora/halt.service
@@ -9,7 +9,7 @@
Description=Halt
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
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
[Service]
Type=finish
diff --git a/units/fedora/poweroff.service b/units/fedora/poweroff.service
index 07af6c62c3..f237e32719 100644
--- a/units/fedora/poweroff.service
+++ b/units/fedora/poweroff.service
@@ -9,7 +9,7 @@
Description=Power-Off
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
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
[Service]
Type=finish
diff --git a/units/fedora/reboot.service b/units/fedora/reboot.service
index 77f5cb3f53..b99dfdc8ac 100644
--- a/units/fedora/reboot.service
+++ b/units/fedora/reboot.service
@@ -9,7 +9,7 @@
Description=Reboot
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
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
[Service]
Type=finish
diff --git a/units/gentoo/Makefile b/units/gentoo/Makefile
new file mode 120000
index 0000000000..50be21181f
--- /dev/null
+++ b/units/gentoo/Makefile
@@ -0,0 +1 @@
+../../src/Makefile \ No newline at end of file
diff --git a/units/gentoo/halt.service b/units/gentoo/halt.service
index 8762a7827b..c5d96043c0 100644
--- a/units/gentoo/halt.service
+++ b/units/gentoo/halt.service
@@ -9,7 +9,7 @@
Description=Halt
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
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
[Service]
Type=finish
diff --git a/units/gentoo/poweroff.service b/units/gentoo/poweroff.service
index 1a0a6a44f8..2cc645ec53 100644
--- a/units/gentoo/poweroff.service
+++ b/units/gentoo/poweroff.service
@@ -9,7 +9,7 @@
Description=Power-Off
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
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
[Service]
Type=finish
diff --git a/units/gentoo/reboot.service b/units/gentoo/reboot.service
index 080a084c75..fdca6f866e 100644
--- a/units/gentoo/reboot.service
+++ b/units/gentoo/reboot.service
@@ -9,7 +9,7 @@
Description=Reboot
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
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
[Service]
Type=finish
diff --git a/units/suse/Makefile b/units/suse/Makefile
new file mode 120000
index 0000000000..50be21181f
--- /dev/null
+++ b/units/suse/Makefile
@@ -0,0 +1 @@
+../../src/Makefile \ No newline at end of file
diff --git a/units/suse/halt.service b/units/suse/halt.service
index 20a01258f8..bc237f02f0 100644
--- a/units/suse/halt.service
+++ b/units/suse/halt.service
@@ -9,7 +9,7 @@
Description=Halt
Requires=shutdown.target
After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
[Service]
Type=finish
diff --git a/units/suse/poweroff.service b/units/suse/poweroff.service
index f3d1542842..a68c10cfd3 100644
--- a/units/suse/poweroff.service
+++ b/units/suse/poweroff.service
@@ -9,7 +9,7 @@
Description=Power-Off
Requires=shutdown.target
After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
[Service]
Type=finish
diff --git a/units/suse/reboot.service b/units/suse/reboot.service
index 2bc452e180..3dbb469117 100644
--- a/units/suse/reboot.service
+++ b/units/suse/reboot.service
@@ -9,7 +9,7 @@
Description=Reboot
Requires=shutdown.target
After=shutdown.target
-Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount
+Conflicts=dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount sys-kernel-security.automount
[Service]
Type=finish