Be less overzealous about removing cached discovery results

[invirt/packages/xvm-iscsi-config.git] / debian / xvm-iscsi-config.postinst

diff --git a/debian/xvm-iscsi-config.postinst b/debian/xvm-iscsi-config.postinst
index 6182942..a58dc00 100755 (executable)
--- a/debian/xvm-iscsi-config.postinst
+++ b/debian/xvm-iscsi-config.postinst
@@ -34,7 +34,9 @@ $(cat /sys/class/iscsi_host/$(readlink /sys/class/iscsi_session/$i/device | perl
 
 get_new_sessions() {
     for i in $(invirt-getconf --ls iscsi.targets); do
 
 get_new_sessions() {
     for i in $(invirt-getconf --ls iscsi.targets); do

-        echo $(invirt-getconf iscsi.targets.$i.ip) $(invirt-getconf iscsi.targets.$i.iface)
+       for j in $(invirt-getconf --ls iscsi.targets.$i.ifaces); do
+            echo $(invirt-getconf iscsi.targets.$i.ip) $(invirt-getconf iscsi.targets.$i.ifaces.$j)
+       done

     done | sort
 }
 
     done | sort
 }
 

@@ -75,15 +77,9 @@ EOF
         fi
         if ! diff <(get_current_sessions) <(get_new_sessions) >/dev/null; then
             if [ -z "$safe" ]; then
         fi
         if ! diff <(get_current_sessions) <(get_new_sessions) >/dev/null; then
             if [ -z "$safe" ]; then

-                for i in $(invirt-getconf --ls iscsi.targets); do
-                    iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.targets.$i.ip):3260 -I $(invirt-getconf iscsi.targets.$i.iface)
-                    iscsiadm -m node -p $(invirt-getconf iscsi.targets.$i.ip):3260 -I $(invirt-getconf iscsi.targets.$i.iface) -l
-                done
+               /usr/lib/xvm-iscsi-connect

             else
             else

-              for i in $(invirt-getconf --ls iscsi.targets); do
-                  echo "  "iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.targets.$i.ip):3260 -I $(invirt-getconf iscsi.targets.$i.iface)
-                  echo "  "iscsiadm -m node -p $(invirt-getconf iscsi.targets.$i.ip):3260 -I $(invirt-getconf iscsi.targets.$i.iface) -l
-              done
+               echo "  /usr/lib/xvm-iscsi-connect"

             fi
             cat <<EOF
 You may want to recreate the LVM nodes:
             fi
             cat <<EOF
 You may want to recreate the LVM nodes: