From 66b072d7d3901696a4b4a581f4b300401761d07c Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Sun, 28 Dec 2008 00:25:35 -0500
Subject: [PATCH 1/1] xvm-iscsi-config: don't restart on upgrade, only first
 install

svn path=/trunk/packages/xvm-iscsi-config/; revision=1923
---
 debian/changelog                 |    6 ++++++
 debian/xvm-iscsi-config.postinst |   19 ++++++++++++++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7c7c9a6..da84753 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-iscsi-config (0.0.4) unstable; urgency=low
+
+  * don't restart iscsi on upgrade, only first install
+
+ -- Greg Price <price@mit.edu>  Sun, 28 Dec 2008 00:24:41 -0500
+
 xvm-iscsi-config (0.0.3) unstable; urgency=low
 
   * Forget invirt-storage-config
diff --git a/debian/xvm-iscsi-config.postinst b/debian/xvm-iscsi-config.postinst
index 12226e3..e7e9faf 100755
--- a/debian/xvm-iscsi-config.postinst
+++ b/debian/xvm-iscsi-config.postinst
@@ -41,9 +41,22 @@ iscsi:
  username: $USERNAME
  password: $PASSWORD
 EOF
-        invoke-rc.d xvm-iscsi-config restart
-        invoke-rc.d open-iscsi restart
-        iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260
+        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:
+  /etc/init.d/xvm-iscsi-config restart
+  /etc/init.d/open-iscsi restart
+  iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260
+  lvchange -a ln /dev/xenvg && lvchange -a y /dev/xenvg
+This will leave VMs unable to access their disks, so migrate them first.
+
+EOF
+        fi
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
-- 
1.7.9.5