From: Lennart Poettering Date: Tue, 1 Jun 2010 22:58:10 +0000 (+0200) Subject: units: tear down sys-kernel-security.automount automount point on shutdown X-Git-Tag: v1~248 X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=9a9a438596e6f57cda87fc7045971197fd2b3078 units: tear down sys-kernel-security.automount automount point on shutdown --- diff --git a/units/fedora/halt.service b/units/fedora/halt.service index ff498e437..50373d48b 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 07af6c62c..f237e3271 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 77f5cb3f5..b99dfdc8a 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 000000000..50be21181 --- /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 8762a7827..c5d96043c 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 1a0a6a44f..2cc645ec5 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 080a084c7..fdca6f866 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 000000000..50be21181 --- /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 20a01258f..bc237f02f 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 f3d154284..a68c10cfd 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 2bc452e18..3dbb46911 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