From 46313b669d77cae26fcccee8749d12cd44b2f49b Mon Sep 17 00:00:00 2001 From: Lukas Nykryn Date: Aug 19 2020 14:22:49 +0000 Subject: 95iscsi: rd.iscsi.initiator should have priority over stored configuration (cherry picked from commit 61afc704548cecc7f7d2fa3b5f1319e790cc5bee) Resolves: #1664062 patch_name: 0011.patch present_in_specfile: true location_in_specfile: 11 squash_commits: true --- diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh index 7a64d88..f00a83b 100755 --- a/modules.d/95iscsi/parse-iscsiroot.sh +++ b/modules.d/95iscsi/parse-iscsiroot.sh @@ -107,14 +107,13 @@ if arg=$(getarg rd.iscsi.initiator -d iscsi_initiator=) && [ -n "$arg" ] && ! [ iscsi_initiator=$arg echo "InitiatorName=$iscsi_initiator" > /run/initiatorname.iscsi ln -fs /run/initiatorname.iscsi /dev/.initiatorname.iscsi - if ! [ -e /etc/iscsi/initiatorname.iscsi ]; then - mkdir -p /etc/iscsi - ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi - if [ -n "$DRACUT_SYSTEMD" ]; then - systemctl try-restart iscsid - # FIXME: iscsid is not yet ready, when the service is :-/ - sleep 1 - fi + rm -f /etc/iscsi/initiatorname.iscsi + mkdir -p /etc/iscsi + ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi + if [ -n "$DRACUT_SYSTEMD" ]; then + systemctl try-restart iscsid + # FIXME: iscsid is not yet ready, when the service is :-/ + sleep 1 fi fi