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

diff --git a/units/fedora/halt.service b/units/fedora/halt.service
index ff498e437505609e31391a7f2775b399f54dd7d0..50373d48b6455193774302a72f992be6f749278f 100644 (file)
--- 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 07af6c62c3b112a3125de8e1541d22ce84874c7d..f237e327193b177c0c1db6954da33415f655ef0c 100644 (file)
--- 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 77f5cb3f536137e624eff0d499089a8bfd615242..b99dfdc8ac47556fd1c5609657d185c277c8142c 100644 (file)
--- 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 (symlink)
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 8762a7827b9554ded80666d18f71f9d2a980802f..c5d96043c04059812ef7c37f5548855df24fd4f6 100644 (file)
--- 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 1a0a6a44f81db25820e96f41b1086d93ffd99c73..2cc645ec5302be14fc9ab00bfbb463fd3166b360 100644 (file)
--- 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 080a084c750fdb46d609c2b3cce2a8f8e5e7873b..fdca6f866ea0d7274a6ab99c50723ce8c2ec2ef5 100644 (file)
--- 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 (symlink)
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 20a01258f89d8b4d7a3a134880fea894d2b98c4f..bc237f02f0244fa2b1cd0c7e528adc4c1eb198a7 100644 (file)
--- 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 f3d1542842579e9c2d686a951519c0c57eecce6a..a68c10cfd3794b14954a4110f5766b1904829e49 100644 (file)
--- 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 2bc452e180a4db020237dfc486d13d4b79de5045..3dbb469117992dfe49cfbc42a3f96150cda37600 100644 (file)
--- 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