diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-09-21 03:16:00 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-09-21 03:56:55 +0200 |
| commit | 0286cc1551927ea93e22b2d451a8bedddfc9d4ea (patch) | |
| tree | c88c9197eb9168641b265c6d0b082c4d85cf8fe7 | |
| parent | c72dcc54315a5bb854849e17a34c6ad8a3f9dfaa (diff) | |
units: drop /sys/kernel/config automount unit
The mount point directory /sys/kernel/config is only created after the
module is loaded, hence there's little value in having this an automount
unit: the runtime penalty for mounting an autofs here should be the same
as for a real mount.
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | TODO | 10 | ||||
| -rw-r--r-- | units/sys-kernel-config.automount | 15 | ||||
| -rw-r--r-- | units/sys-kernel-config.mount | 4 |
4 files changed, 15 insertions, 19 deletions
diff --git a/Makefile.am b/Makefile.am index 60fb3ff726..de6325d4a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -361,7 +361,6 @@ dist_systemunit_DATA = \ units/dev-hugepages.mount \ units/dev-mqueue.automount \ units/dev-mqueue.mount \ - units/sys-kernel-config.automount \ units/sys-kernel-config.mount \ units/sys-kernel-debug.automount \ units/sys-kernel-debug.mount \ @@ -1842,7 +1841,7 @@ endif ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ rm -f dev-hugepages.automount \ dev-mqueue.automount \ - sys-kernel-config.automount \ + sys-kernel-config.mount \ sys-kernel-debug.automount \ sys-kernel-security.automount \ systemd-vconsole-setup.service \ @@ -1855,7 +1854,7 @@ endif cryptsetup.target && \ $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \ $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \ - $(LN_S) ../sys-kernel-config.automount sys-kernel-config.automount && \ + $(LN_S) ../sys-kernel-config.mount sys-kernel-config.mount && \ $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount && \ $(LN_S) ../sys-kernel-security.automount sys-kernel-security.automount && \ $(LN_S) ../systemd-vconsole-setup.service systemd-vconsole-setup.service && \ @@ -13,6 +13,16 @@ Bugfixes: Features: +* File systems: + + mqueue - boot + configfs module boot (order after module load) + securityfs - boot + binfmt_misc module autofs + fuse module udev + debug - boot + 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/sys-kernel-config.automount b/units/sys-kernel-config.automount deleted file mode 100644 index 1b4e81117d..0000000000 --- a/units/sys-kernel-config.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=Config File System Automount Point -DefaultDependencies=no -Before=sysinit.target -ConditionPathExists=/sys/kernel/config - -[Automount] -Where=/sys/kernel/config diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount index a80d052556..f64b1ac25f 100644 --- a/units/sys-kernel-config.mount +++ b/units/sys-kernel-config.mount @@ -6,8 +6,10 @@ # (at your option) any later version. [Unit] -Description=Config File System +Description=Configuration File System DefaultDependencies=no +ConditionPathExists=/sys/kernel/config +After=systemd-modules-load.service [Mount] What=configfs |