From: Franck Bui <fbui@suse.com>
Date: Thu, 19 Nov 2020 07:55:56 +0000 (+0100)
Subject: Revert "units: skip modprobe@.service if the unit appears to be already loaded"
X-Git-Tag: v247~46^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b3e32582f67c68896b6b05893b138a975fa26454;p=thirdparty%2Fsystemd.git

Revert "units: skip modprobe@.service if the unit appears to be already loaded"

This reverts commit 9cbf1e58f9629af5c6b56777ee73dc6320306d6d.

The presence of /sys/module/%I directory can't be used to assert that the load
of a given module is complete and therefore the call to modprobe(8) can be
skipped. Indeed this directory is created before the init() function of the
module is called.

Users of modprobe@.service needs to be sure that once this service returns the
module is fully operational.
---

diff --git a/units/modprobe@.service b/units/modprobe@.service
index 968994287ca..cf8baf60846 100644
--- a/units/modprobe@.service
+++ b/units/modprobe@.service
@@ -13,7 +13,6 @@ DefaultDependencies=no
 Before=sysinit.target
 Documentation=man:modprobe(8)
 ConditionCapability=CAP_SYS_MODULE
-ConditionPathExists=!/sys/module/%I
 
 [Service]
 Type=oneshot