CA-346583: make set-iscsi-initiator idempotent

Signed-off-by: Mark Syms <mark.syms@citrix.com>
xapi-project · Oct 9, 2020 · 055be64 · 055be64
1 parent 1e5864c
commit 055be64
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/scripts/set-iscsi-initiator b/scripts/set-iscsi-initiator
@@ -35,9 +35,20 @@ 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,8 +57,8 @@ TMPFILE=$TMPDIR/initiatorname.iscsi
                 exit 1
         fi
 
-        echo "InitiatorName=$1" > $TMPFILE
-        echo "InitiatorAlias=$2" >> $TMPFILE
+        echo "InitiatorName=$INITIATORNAME" > $TMPFILE
+        echo "InitiatorAlias=$INITIATORALIAS" >> $TMPFILE
 
         diff $INITIATORFILE $TMPFILE > /dev/null 2>&1 
         if [ $? -eq 0 ]