Merge pull request #519 from MarkSymsCtx/CA-346583

CA-346583: make set-iscsi-initiator idempotent
xapi-project · Oct 12, 2020 · a18b2ee · a18b2ee
2 parents 1e5864c + 893acaf
commit a18b2ee
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/scripts/set-iscsi-initiator b/scripts/set-iscsi-initiator
@@ -33,11 +33,21 @@ trap ecleanup TERM
 mkdir -p /var/lock/sm/iscsiadm
 
 INITIATORFILE=/etc/iscsi/initiatorname.iscsi
-TMPFILE=$TMPDIR/initiatorname.iscsi
+
+INITIATORNAME=$1
+INITIATORALIAS=$2
 
 (
         flock -s 200
 
+        CURRENT_INITATOR=$(awk 'BEGIN { FS = "=" } /InitiatorName/ {print $2}' $INITIATORFILE)
+        CURRENT_ALIAS=$(awk 'BEGIN { FS = "=" } /InitiatorAlias/ {print $2}' $INITIATORFILE)
+
+        if [ "$CURRENT_INITATOR" == "$INITIATORNAME" -a "$CURRENT_ALIAS" == "$INITIATORALIAS" ]
+        then
+            exit 0
+        fi
+
         iscsiadm -m session > /dev/null 2>&1
         if [ $? -eq 0 ]
         then
@@ -46,18 +56,8 @@ TMPFILE=$TMPDIR/initiatorname.iscsi
                 exit 1
         fi
 
-        echo "InitiatorName=$1" > $TMPFILE
-        echo "InitiatorAlias=$2" >> $TMPFILE
-
-        diff $INITIATORFILE $TMPFILE > /dev/null 2>&1 
-        if [ $? -eq 0 ]
-        then
-            # unchanged so remove the tmp file
-            rm $TMPFILE
-            exit 0
-        fi
-
-        mv $TMPFILE $INITIATORFILE
+        echo "InitiatorName=$INITIATORNAME" > $INITIATORFILE
+        echo "InitiatorAlias=$INITIATORALIAS" >> $INITIATORFILE
 
         systemctl is-active -q iscsid
         if [ $? -eq 0 ]