units: drop automount unit for /dev/mqueue

Since the mqueue support cannot be built as a module there's little
benefit in having an autofs mount point set up for this.

diff --git a/Makefile.am b/Makefile.am
index 25ebc51a8e2d29b35cef98dc439e1832c28a6027..038e71e6bf9d2f8c14cabade87a4fb37a0784285 100644 (file)
--- 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 889036051bc9b0b1455338c09e5b83f5306a76c9..477f08f3dc606d94a241ca44db37a0917c7d976a 100644 (file)
--- 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 (file)
index 1061597..0000000
--- 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 8519df5acaf0a544b05d7881c4e9663b94eec8d4..cffdaf773fd35b5adb6c48175cc464ce5e5304c2 100644 (file)
--- 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