]> git.ipfire.org Git - thirdparty/dracut-ng.git/commitdiff
fix(iscsi): drop ExecStartPre startup-checks.sh from iscsid.service
authorBenjamin Drung <benjamin.drung@canonical.com>
Tue, 28 Oct 2025 15:50:54 +0000 (16:50 +0100)
committerNeal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
Tue, 28 Oct 2025 23:54:03 +0000 (19:54 -0400)
`/usr/lib/open-iscsi/startup-checks.sh` checks that
`/etc/iscsi/iscsid.conf` and `/etc/iscsi/initiatorname.iscsi` are
present. This is not the case for initrds built without hostonly.

So just drop `/usr/lib/open-iscsi/startup-checks.sh` from
`iscsid.service` and rely on dracut to generate a working environment
for iscsid.

modules.d/74iscsi/module-setup.sh

index af361c1453c0ea70b2a214c98b276729331cb37b..e8ea37eb2707044c4ec31cb3975c8c57f8bb81e2 100755 (executable)
@@ -220,9 +220,8 @@ install() {
             "$systemdsystemunitdir"/iscsiuio.socket \
             "$systemdsystemunitdir"/sockets.target.wants/iscsid.socket \
             "$systemdsystemunitdir"/sockets.target.wants/iscsiuio.socket
-        if grep -q '^ExecStartPre=/usr/lib/open-iscsi/startup-checks.sh$' "${dracutsysrootdir-}$systemdsystemunitdir/iscsid.service"; then
-            inst_simple /usr/lib/open-iscsi/startup-checks.sh
-        fi
+        sed -i '/ExecStartPre=\/usr\/lib\/open-iscsi\/startup-checks.sh/d' \
+            "${dracutsysrootdir-}$systemdsystemunitdir/iscsid.service"
 
         for i in \
             iscsid.socket \