summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am5
-rw-r--r--TODO4
-rw-r--r--units/dev-mqueue.automount15
-rw-r--r--units/dev-mqueue.mount2
4 files changed, 6 insertions, 20 deletions
diff --git a/Makefile.am b/Makefile.am
index 25ebc51a8e..038e71e6bf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -359,7 +359,6 @@ dist_systemunit_DATA = \
units/syslog.socket \
units/dev-hugepages.automount \
units/dev-hugepages.mount \
- units/dev-mqueue.automount \
units/dev-mqueue.mount \
units/sys-kernel-config.mount \
units/sys-kernel-debug.mount \
@@ -1838,7 +1837,7 @@ endif
$(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
rm -f dev-hugepages.automount \
- dev-mqueue.automount \
+ dev-mqueue.mount \
sys-kernel-config.mount \
sys-kernel-debug.mount \
sys-kernel-security.mount \
@@ -1851,7 +1850,7 @@ endif
systemd-kmsg-syslogd.service \
cryptsetup.target && \
$(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
- $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
+ $(LN_S) ../dev-mqueue.mount dev-mqueue.mount && \
$(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.mount sys-kernel-security.mount && \
diff --git a/TODO b/TODO
index 889036051b..477f08f3dc 100644
--- a/TODO
+++ b/TODO
@@ -15,9 +15,9 @@ Features:
* File systems:
- mqueue - boot
+ mqueue - boot GOOD
configfs module boot (order after module load) GOOD
- securityfs - boot
+ securityfs - boot GOOD
binfmt_misc module autofs GOOD
fuse module udev GOOD
debug - boot GOOD
diff --git a/units/dev-mqueue.automount b/units/dev-mqueue.automount
deleted file mode 100644
index 1061597571..0000000000
--- a/units/dev-mqueue.automount
+++ /dev/null
@@ -1,15 +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=POSIX Message Queue File System Automount Point
-DefaultDependencies=no
-Before=sysinit.target
-ConditionPathExists=/proc/sys/fs/mqueue
-
-[Automount]
-Where=/dev/mqueue
diff --git a/units/dev-mqueue.mount b/units/dev-mqueue.mount
index 8519df5aca..cffdaf773f 100644
--- a/units/dev-mqueue.mount
+++ b/units/dev-mqueue.mount
@@ -8,6 +8,8 @@
[Unit]
Description=POSIX Message Queue File System
DefaultDependencies=no
+Before=sysinit.target
+ConditionPathExists=/proc/sys/fs/mqueue
[Mount]
What=mqueue