From 7e36455fb47eb64b5e19aede7a6679cce988536c Mon Sep 17 00:00:00 2001
From: Greg Price <price@mit.edu>
Date: Sun, 28 Dec 2008 01:01:02 -0500
Subject: [PATCH] xvm-iscsi-config: print restart message only if settings
 actually changed

also, don't fail in prerm if /etc/invirt/conf.d/iscsi missing

svn path=/trunk/packages/xvm-iscsi-config/; revision=1925
---
 debian/changelog                 |    8 ++++++++
 debian/xvm-iscsi-config.postinst |   11 +++++++----
 debian/xvm-iscsi-config.prerm    |    6 +++---
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index da84753..be8c683 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xvm-iscsi-config (0.0.5) unstable; urgency=low
+
+  * check automatically if settings changed in postinst,
+    print "restart iscsi" message only if they did
+  * don't fail in prerm if /etc/invirt/conf.d/iscsi missing
+
+ -- Greg Price <price@mit.edu>  Sun, 28 Dec 2008 00:58:01 -0500
+
 xvm-iscsi-config (0.0.4) unstable; urgency=low
 
   * don't restart iscsi on upgrade, only first install
diff --git a/debian/xvm-iscsi-config.postinst b/debian/xvm-iscsi-config.postinst
index e7e9faf..1722daa 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
@@ -45,10 +49,9 @@ 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
-        else
-            # Don't disrupt an existing installation.
-            cat <<EOF
-xvm-iscsi-config: If the configuration has changed, restart iscsi:
+        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
diff --git a/debian/xvm-iscsi-config.prerm b/debian/xvm-iscsi-config.prerm
index 8bd57ab..cb6d309 100755
--- a/debian/xvm-iscsi-config.prerm
+++ b/debian/xvm-iscsi-config.prerm
@@ -18,11 +18,11 @@ set -e
 
 
 case "$1" in
-    remove|upgrade|deconfigure)
-        rm /etc/invirt/conf.d/iscsi
+    remove|deconfigure)
+        rm -f /etc/invirt/conf.d/iscsi
     ;;
 
-    failed-upgrade)
+    upgrade|failed-upgrade)
     ;;
 
     *)
-- 
1.7.9.5