[systemd-commits] units/fedora units/gentoo units/suse

[Lennart Poettering]

 units/fedora/halt.service     |    2 +-
 units/fedora/poweroff.service |    2 +-
 units/fedora/reboot.service   |    2 +-
 units/gentoo/Makefile         |    1 +
 units/gentoo/halt.service     |    2 +-
 units/gentoo/poweroff.service |    2 +-
 units/gentoo/reboot.service   |    2 +-
 units/suse/Makefile           |    1 +
 units/suse/halt.service       |    2 +-
 units/suse/poweroff.service   |    2 +-
 units/suse/reboot.service     |    2 +-
 11 files changed, 11 insertions(+), 9 deletions(-)

New commits:
commit 9a9a438596e6f57cda87fc7045971197fd2b3078
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jun 2 00:58:10 2010 +0200

    units: tear down sys-kernel-security.automount automount point on shutdown

diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index ff498e4..50373d4 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 07af6c6..f237e32 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 77f5cb3..b99dfdc 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 0000000..50be211
--- /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 8762a78..c5d9604 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 1a0a6a4..2cc645e 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 080a084..fdca6f8 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 0000000..50be211
--- /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 20a0125..bc237f0 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 f3d1542..a68c10c 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 2bc452e..3dbb469 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