]> git.ipfire.org Git - thirdparty/dracut.git/commitdiff
iscsi/parse-iscsiroot.sh: only set initiator-name, if not empty
authorHarald Hoyer <harald@redhat.com>
Thu, 3 Sep 2015 10:41:06 +0000 (12:41 +0200)
committerHarald Hoyer <harald@redhat.com>
Wed, 11 Nov 2015 15:36:25 +0000 (16:36 +0100)
(cherry picked from commit eb87dc91d078ee942ef9c8bbc8e82f4ee4ccf0c6)

modules.d/95iscsi/parse-iscsiroot.sh

index dab58db126c4acd8c469f1d35a3a397ab9f4f2ec..81be6a9d4967b62d7bc703df85a4418dc4a53d2d 100755 (executable)
@@ -112,12 +112,14 @@ fi
 # If not given on the cmdline and initiator-name available via iBFT
 if [ -z $iscsi_initiator ] && [ -f /sys/firmware/ibft/initiator/initiator-name ] && ! [ -f /tmp/iscsi_set_initiator ]; then
     iscsi_initiator=$(while read line || [ -n "$line" ]; do echo $line;done < /sys/firmware/ibft/initiator/initiator-name)
-    echo "InitiatorName=$iscsi_initiator" > /run/initiatorname.iscsi
-    rm -f /etc/iscsi/initiatorname.iscsi
-    mkdir -p /etc/iscsi
-    ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
-    > /tmp/iscsi_set_initiator
-    systemctl try-restart iscsid && sleep 1
+    if [ -n "$iscsi_initiator" ]; then
+        echo "InitiatorName=$iscsi_initiator" > /run/initiatorname.iscsi
+        rm -f /etc/iscsi/initiatorname.iscsi
+        mkdir -p /etc/iscsi
+        ln -fs /run/initiatorname.iscsi /etc/iscsi/initiatorname.iscsi
+        > /tmp/iscsi_set_initiator
+        systemctl try-restart iscsid && sleep 1
+    fi
 fi