From 07ccf434e77b17b20d773ce8b2637083cd4fdafc Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 20 Nov 2020 11:52:36 +0100 Subject: [PATCH] units: restore sysfs conditions in sys-fs-fuse-connections.mount and sys-kernel-config.mount Commit 42cc2855ba2fe4c6f5d incorrectly removed the condition on sysfs in both sys-fs-fuse-connections.mount and sys-kernel-config.mount. However there are still needed in case modprobe of one of these modules is intentionally skipped (due to lack of privs for example). This patch restores the 2 conditions which should be safe for the common case, since all conditions are only checked after all deps ordered before are complete. Follow-up for 42cc2855ba2fe4c6f5dc863507a1c843611350a0. --- units/sys-fs-fuse-connections.mount | 1 + units/sys-kernel-config.mount | 1 + 2 files changed, 2 insertions(+) diff --git a/units/sys-fs-fuse-connections.mount b/units/sys-fs-fuse-connections.mount index b649a1ed19..ca48fd5f4f 100644 --- a/units/sys-fs-fuse-connections.mount +++ b/units/sys-fs-fuse-connections.mount @@ -12,6 +12,7 @@ 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 Before=sysinit.target diff --git a/units/sys-kernel-config.mount b/units/sys-kernel-config.mount index 7d965046ee..b99b4f4b7e 100644 --- a/units/sys-kernel-config.mount +++ b/units/sys-kernel-config.mount @@ -12,6 +12,7 @@ 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 Before=sysinit.target