mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
Merge pull request #17667 from fbuihuu/fix-module-loading-from-udev-rule
Fix module loading from udev rule
This commit is contained in:
commit
bca0618705
|
@ -13,7 +13,6 @@ DefaultDependencies=no
|
|||
Before=sysinit.target
|
||||
Documentation=man:modprobe(8)
|
||||
ConditionCapability=CAP_SYS_MODULE
|
||||
ConditionPathExists=!/sys/module/%I
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
|
|
|
@ -12,12 +12,18 @@ Description=FUSE Control File System
|
|||
Documentation=https://www.kernel.org/doc/Documentation/filesystems/fuse.txt
|
||||
Documentation=https://www.freedesktop.org/wiki/Software/systemd/APIFileSystems
|
||||
DefaultDependencies=no
|
||||
ConditionPathExists=/sys/fs/fuse/connections
|
||||
ConditionCapability=CAP_SYS_ADMIN
|
||||
ConditionVirtualization=!private-users
|
||||
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/fs/fuse/connections is created, see issue#17586.
|
||||
|
||||
After=modprobe@fuse.service
|
||||
Requires=modprobe@fuse.service
|
||||
|
||||
[Mount]
|
||||
What=fusectl
|
||||
Where=/sys/fs/fuse/connections
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue