diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-09-21 03:35:19 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-09-21 03:56:56 +0200 |
| commit | ac0a983ac6a47cf445ead257aa5a38b06779366e (patch) | |
| tree | 35991fc5192897d2dff65f8b105d49547ce0d12d | |
| parent | 1f2c94a48782daba71dd1960b5058180e37efb2f (diff) | |
units: drop automount unit for /dev/hugepages
Since hugetlbfs cannot be compiled as kernel module there's little point
in doing on-demand mounting via autofs for it.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | TODO | 10 | ||||
| -rw-r--r-- | units/dev-hugepages.automount | 15 | ||||
| -rw-r--r-- | units/dev-hugepages.mount | 2 |
4 files changed, 4 insertions, 28 deletions
diff --git a/Makefile.am b/Makefile.am index 038e71e6bf..3e102a4ced 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 && \ @@ -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 index 6e03df3560..0000000000 --- a/units/dev-hugepages.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=Huge Pages File System Automount Point -DefaultDependencies=no -Before=sysinit.target -ConditionPathExists=/sys/kernel/mm/hugepages - -[Automount] -Where=/dev/hugepages diff --git a/units/dev-hugepages.mount b/units/dev-hugepages.mount index e6014e54a0..72a522e69c 100644 --- a/units/dev-hugepages.mount +++ b/units/dev-hugepages.mount @@ -8,6 +8,8 @@ [Unit] Description=Huge Pages File System DefaultDependencies=no +Before=sysinit.target +ConditionPathExists=/sys/kernel/mm/hugepages [Mount] What=hugetlbfs |