From 1f2c94a48782daba71dd1960b5058180e37efb2f Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 21 Sep 2011 03:29:47 +0200
Subject: [PATCH] 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.
---
 Makefile.am                |  5 ++---
 TODO                       |  4 ++--
 units/dev-mqueue.automount | 15 ---------------
 units/dev-mqueue.mount     |  2 ++
 4 files changed, 6 insertions(+), 20 deletions(-)
 delete mode 100644 units/dev-mqueue.automount

diff --git a/Makefile.am b/Makefile.am
index 25ebc51a8..038e71e6b 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 889036051..477f08f3d 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 106159757..000000000
--- 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 8519df5ac..cffdaf773 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
-- 
2.30.2