95iscsi: rd.iscsi.initiator should have priority over stored configuration

diff --git a/modules.d/95iscsi/parse-iscsiroot.sh b/modules.d/95iscsi/parse-iscsiroot.sh
index 7a64d888339e8f0e4c0a8d6d03a85a9a6da31748..f00a83bb62a6012430865c26136367791ff6a144 100755 (executable)
--- 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