summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--units/sys-kernel-security.automount16
-rw-r--r--units/sys-kernel-security.mount3
3 files changed, 5 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am
index ad21f681e4..25ebc51a8e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -363,7 +363,6 @@ dist_systemunit_DATA = \
units/dev-mqueue.mount \
units/sys-kernel-config.mount \
units/sys-kernel-debug.mount \
- units/sys-kernel-security.automount \
units/sys-kernel-security.mount \
units/var-run.mount \
units/media.mount \
@@ -1842,7 +1841,7 @@ endif
dev-mqueue.automount \
sys-kernel-config.mount \
sys-kernel-debug.mount \
- sys-kernel-security.automount \
+ sys-kernel-security.mount \
systemd-vconsole-setup.service \
systemd-modules-load.service \
systemd-random-seed-load.service \
@@ -1855,7 +1854,7 @@ endif
$(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
$(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \
$(LN_S) ../sys-kernel-debug.mount sys-kernel-debug.mount && \
- $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \
+ $(LN_S) ../sys-kernel-security.mount sys-kernel-security.mount && \
$(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \
$(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
$(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
diff --git a/units/sys-kernel-security.automount b/units/sys-kernel-security.automount
deleted file mode 100644
index b0fc4618ec..0000000000
--- a/units/sys-kernel-security.automount
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is part of systemd.
-#
-# systemd is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-[Unit]
-Description=Security File System Automount Point
-DefaultDependencies=no
-Before=sysinit.target
-ConditionPathExists=/sys/kernel/security
-ConditionPathIsMountPoint=!/sys/kernel/security
-
-[Automount]
-Where=/sys/kernel/security
diff --git a/units/sys-kernel-security.mount b/units/sys-kernel-security.mount
index 770207f004..f5d84a6fe2 100644
--- a/units/sys-kernel-security.mount
+++ b/units/sys-kernel-security.mount
@@ -8,6 +8,9 @@
[Unit]
Description=Security File System
DefaultDependencies=no
+ConditionPathExists=/sys/kernel/security
+ConditionPathIsMountPoint=!/sys/kernel/security
+Before=sysinit.target
[Mount]
What=securityfs