units: restore sysfs conditions in sys-fs-fuse-connections.mount and sys-kernel-confi...

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.

diff --git a/units/sys-fs-fuse-connections.mount b/units/sys-fs-fuse-connections.mount
index b649a1ed199be6bfe96caca1077cb7e04af65f67..ca48fd5f4faac9001ce14ce302c46a36eed09099 100644 (file)
--- 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 7d965046ee5ee29083003a2e30920fc087651648..b99b4f4b7e5a624758726152ff9352ab99acb605 100644 (file)
--- 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