summaryrefslogtreecommitdiff
path: root/units/sys-kernel-config.mount
diff options
context:
space:
mode:
authorFranck Bui <fbui@suse.com>2020-11-19 09:17:19 +0100
committerFranck Bui <fbui@suse.com>2020-11-19 11:50:52 +0100
commit42cc2855ba2fe4c6f5dc863507a1c843611350a0 (patch)
tree1bc5453f902b61e39914b4a4f69a1343e71eaf0d /units/sys-kernel-config.mount
parentb3e32582f67c68896b6b05893b138a975fa26454 (diff)
downloadsystemd-42cc2855ba2fe4c6f5dc863507a1c843611350a0.tar.gz
units: wait until some fs modules are entirely loaded before mounting their corresponding filesystem
udev requests to start the fs mount units when their respective module is loaded. For that it monitors uevents of type "ADD" for the relevant fs modules. However the uevent is sent by the kernel too early, ie before the init() of the module is called hence before directories in /sys/fs/ are created. This patch workarounds adds "Requires/After=modprobe@<fs-module>.service" to the mount unit, which means that modprobe(8) will be called once the fs module is announced to be loaded. This sounds pointless, but given that modprobe only returns after the initialization of the module is complete, it should workaround the issue. As a side effect, the module will be automatically loaded if the mount unit is started manually. Fixes #17586.
Diffstat (limited to 'units/sys-kernel-config.mount')
-rw-r--r--units/sys-kernel-config.mount10
1 files changed, 8 insertions, 2 deletions
diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount
index 001c7b57cc..7d965046ee 100644
--- a/units/sys-kernel-config.mount
+++ b/units/sys-kernel-config.mount
@@ -12,11 +12,17 @@ Description=Kernel Configuration File System
Documentation=https://www.kernel.org/doc/Documentation/filesystems/configfs/configfs.txt
Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
DefaultDependencies=no
-ConditionPathExists=/sys/kernel/config
ConditionCapability=CAP_SYS_RAWIO
-After=systemd-modules-load.service
Before=sysinit.target
+# These dependencies are used to make certain that the module is fully
+# loaded. Indeed udev starts this unit when it receives an uevent for the
+# module but the kernel sends it too early, ie before the init() of the module
+# is fully operational and /sys/kernel/config is created, see issue#17586.
+
+After=modprobe@configfs.service
+Requires=modprobe@configfs.service
+
[Mount]
What=configfs
Where=/sys/kernel/config