chiark / gitweb /
units: drop automount unit for /dev/hugepages
authorLennart Poettering <lennart@poettering.net>
Wed, 21 Sep 2011 01:35:19 +0000 (03:35 +0200)
committerLennart Poettering <lennart@poettering.net>
Wed, 21 Sep 2011 01:56:56 +0000 (03:56 +0200)
Since hugetlbfs cannot be compiled as kernel module there's little point
in doing on-demand mounting via autofs for it.

Makefile.am
TODO
units/dev-hugepages.automount [deleted file]
units/dev-hugepages.mount

index 038e71e..3e102a4 100644 (file)
@@ -357,7 +357,6 @@ dist_systemunit_DATA = \
        units/systemd-stdout-syslog-bridge.socket \
        units/systemd-shutdownd.socket \
        units/syslog.socket \
-       units/dev-hugepages.automount \
        units/dev-hugepages.mount \
        units/dev-mqueue.mount \
        units/sys-kernel-config.mount \
@@ -1836,7 +1835,7 @@ endif
                rm -f remote-fs.target && \
                $(LN_S) $(systemunitdir)/remote-fs.target remote-fs.target )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f dev-hugepages.automount \
+               rm -f dev-hugepages.mount \
                        dev-mqueue.mount \
                         sys-kernel-config.mount \
                        sys-kernel-debug.mount \
@@ -1849,7 +1848,7 @@ endif
                        systemd-ask-password-console.path \
                        systemd-kmsg-syslogd.service \
                        cryptsetup.target && \
-               $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
+               $(LN_S) ../dev-hugepages.mount dev-hugepages.mount && \
                $(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 && \
diff --git a/TODO b/TODO
index 477f08f..fcd76cb 100644 (file)
--- a/TODO
+++ b/TODO
@@ -13,16 +13,6 @@ Bugfixes:
 
 Features:
 
-* File systems:
-
-  mqueue         -       boot                            GOOD
-  configfs       module  boot (order after module load)  GOOD
-  securityfs     -       boot                            GOOD
-  binfmt_misc    module  autofs                          GOOD
-  fuse           module  udev                            GOOD
-  debug          -       boot                            GOOD
-  hugepages      -       boot
-
 * introduce sd_log_open() to create a connection to the syslog bridge via sd-daemon.h
 
 * when a bus name of a service disappears from the bus make sure to queue further activation requests
diff --git a/units/dev-hugepages.automount b/units/dev-hugepages.automount
deleted file mode 100644 (file)
index 6e03df3..0000000
+++ /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=Huge Pages File System Automount Point
-DefaultDependencies=no
-Before=sysinit.target
-ConditionPathExists=/sys/kernel/mm/hugepages
-
-[Automount]
-Where=/dev/hugepages
index e6014e5..72a522e 100644 (file)
@@ -8,6 +8,8 @@
 [Unit]
 Description=Huge Pages File System
 DefaultDependencies=no
+Before=sysinit.target
+ConditionPathExists=/sys/kernel/mm/hugepages
 
 [Mount]
 What=hugetlbfs