X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=zephyr%2Fdebian%2Fzephyr-clients.postinst;h=40ff3c242565157cf765759b20c36d3662f98ad5;hb=759f3dfc2a24908a4fd8ef4a510d698cd2ba1cae;hp=8f71a29b8af790727349f94056fed2c6573302ae;hpb=52244dfb047ad77e0eb37f69cefc2058afa9d82d;p=1ts-debian.git

diff --git a/zephyr/debian/zephyr-clients.postinst b/zephyr/debian/zephyr-clients.postinst
index 8f71a29..40ff3c2 100644
--- a/zephyr/debian/zephyr-clients.postinst
+++ b/zephyr/debian/zephyr-clients.postinst
@@ -26,32 +26,35 @@ case "$1" in
     configure)
 
 	. /usr/share/debconf/confmodule
+	db_version 2.0
 
-	tmpfile=`tempfile`
+	db_set zephyr-clients/read_conf true
 
 	if test -f /etc/zephyr/zephyr.conf
 	then
-		if test ! -f /dev/default/zephyr-clients
+		if test ! -f /etc/default/zephyr-clients
 		then
 			mv /etc/zephyr/zephyr.conf /etc/default/zephyr-clients
 		fi
 	fi
 
-	zhm_args=""
+	# if /etc/default/zephyr-clients already exists and has a zhm_args
+        # line, the config script should have sucked it into debconf
+	db_get zephyr-clients/servers
+
+	tmpfile=/etc/default/zephyr-client.dpkg-new
 	if test -f /etc/default/zephyr-clients
 	then
-		. /etc/default/zephyr-clients
-	fi
-	if test -z "$zhm_args"
-	then
-		db_get zephyr-clients/servers
-		if test -f /etc/default/zephyr-clients
-		then
-			grep -v ^zhm_args /etc/default/zephyr-clients > $tmpfile || true
-		fi
-		echo zhm_args=\"${RET}\" >> $tmpfile
-		cat $tmpfile > /etc/default/zephyr-clients
+		grep -v ^zhm_args /etc/default/zephyr-clients > $tmpfile || true
+	else
+		cat > $tmpfile << EOF
+# This file is automatically rewritten by the zephyr-clients post-install
+# script.  So treat it right.
+EOF
 	fi
+	echo zhm_args=\"${RET}\" >> $tmpfile
+	cat $tmpfile > /etc/default/zephyr-clients
+	rm $tmpfile
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)
@@ -64,11 +67,18 @@ case "$1" in
     ;;
 esac
 
+if [ -x "/etc/init.d/zhm" ]; then
+	# this script does not necessarily fail if these do
+        if [ -x "`which invoke-rc.d 2>/dev/null`" ]; then
+                invoke-rc.d zhm restart
+        else
+                /etc/init.d/zhm restart
+        fi
+fi
+
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 
 #DEBHELPER#
 
 exit 0
-
-