Changeset 1925 for trunk/packages/xvm-iscsi-config/debian/xvm-iscsi-config.postinst

Timestamp:

Dec 28, 2008, 1:01:02 AM (16 years ago)

Author:

price

Message:

xvm-iscsi-config: print restart message only if settings actually changed

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

File:

• trunk/packages/xvm-iscsi-config/debian/xvm-iscsi-config.postinst (modified) (2 diffs)

trunk/packages/xvm-iscsi-config/debian/xvm-iscsi-config.postinst

@@ -36 +36 @@
         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:
@@ -46 +50 @@
             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