]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
95iscsi: drop systemd dracut service dependencies for iscsid
authorDusty Mabe <dusty@dustymabe.com>
Mon, 22 Oct 2018 17:25:29 +0000 (13:25 -0400)
committerHarald Hoyer <harald@hoyer.xyz>
Wed, 24 Oct 2018 06:57:24 +0000 (08:57 +0200)
These dependencies cause an odd issue where swap devices specified
by resume= on the kernel command line will cause systemd device
timeouts to occur on boot. According to @haraldh these lines aren't
needed because the socket activiation will take care of it for us.
Removing these lines now as it fixes the resume= device timeout issue.

Fixes #480
Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1641268

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

index 5c2073bbf566d41ffb1f69812fb2dcc6f1a40c6f..3c79100150cc10e99da4acde95475875e71d3aac 100755 (executable)
@@ -257,14 +257,6 @@ install() {
             ; do
             ln_r "$systemdsystemunitdir/${i}" "$systemdsystemunitdir/basic.target.wants/${i}"
         done
-
-        # Make sure iscsid is started after dracut-cmdline and ready for the initqueue
-        mkdir -p "${initdir}/$systemdsystemunitdir/iscsid.service.d"
-        (
-            echo "[Unit]"
-            echo "After=dracut-cmdline.service"
-            echo "Before=dracut-initqueue.service"
-        ) > "${initdir}/$systemdsystemunitdir/iscsid.service.d/dracut.conf"
     fi
     inst_dir /var/lib/iscsi
     dracut_need_initqueue