X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/xvm-iscsi-config.git/blobdiff_plain/66b072d7d3901696a4b4a581f4b300401761d07c..461739066adb313f2aee52b3a272e827c0bc0c7f:/debian/xvm-iscsi-config.postinst

diff --git a/debian/xvm-iscsi-config.postinst b/debian/xvm-iscsi-config.postinst
index e7e9faf..0b7a06e 100755
--- a/debian/xvm-iscsi-config.postinst
+++ b/debian/xvm-iscsi-config.postinst
@@ -35,6 +35,10 @@ case "$1" in
         PASSWORD="$RET"
         db_stop
         
+        if [ -e /etc/invirt/conf.d/iscsi ]; then
+          # invirt.config.run_parts_list excludes backup filenames.
+          mv -f /etc/invirt/conf.d/iscsi /etc/invirt/conf.d/iscsi~
+        fi
         cat >/etc/invirt/conf.d/iscsi <<EOF
 iscsi:
  address: $ADDRESS
@@ -44,14 +48,13 @@ EOF
         if [ -z "$2" ]; then
             invoke-rc.d xvm-iscsi-config restart
             invoke-rc.d open-iscsi restart
-            iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260
-        else
-            # Don't disrupt an existing installation.
-            cat <<EOF
-xvm-iscsi-config: If the configuration has changed, restart iscsi:
+            iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260 -I eth0 -I eth1
+        elif ! diff /etc/invirt/conf.d/iscsi~ /etc/invirt/conf.d/iscsi >/dev/null; then
+              cat <<EOF
+xvm-iscsi-config: The configuration has changed.  Restart iscsi:
   /etc/init.d/xvm-iscsi-config restart
   /etc/init.d/open-iscsi restart
-  iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260
+  iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260 -I eth0 -I eth1
   lvchange -a ln /dev/xenvg && lvchange -a y /dev/xenvg
 This will leave VMs unable to access their disks, so migrate them first.