only consult debconf if there is anything to be configured

git-svn-id: svn://svn.1ts.org/debian/trunk/zephyr@59 cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f

diff --git a/debian/zephyr-clients.config b/debian/zephyr-clients.config
index 26de8d36fd59cc3e2fe4f7c55310863fb0d5744d..16a003d016e06c7f71079bc5b15273cd2baa8666 100644 (file)
--- a/debian/zephyr-clients.config
+++ b/debian/zephyr-clients.config
@@ -2,6 +2,13 @@
 
 . /usr/share/debconf/confmodule
 
-db_input high zephyr-clients/servers || true
-db_go
-
+zhm_args=""
+if test -f /etc/default/zephyr-clients
+then
+       . /etc/default/zephyr-client
+fi
+if test -z "$zhm_args"
+then
+       db_input high zephyr-clients/servers || true
+       db_go
+fi

diff --git a/debian/zephyr-clients.postinst b/debian/zephyr-clients.postinst
index d2104e3f9e9e6f734056dfd02b841737d80ff291..8f71a29b8af790727349f94056fed2c6573302ae 100644 (file)
--- a/debian/zephyr-clients.postinst
+++ b/debian/zephyr-clients.postinst
@@ -37,13 +37,21 @@ case "$1" in
                fi
        fi
 
-       db_get zephyr-clients/servers
+       zhm_args=""
        if test -f /etc/default/zephyr-clients
        then
-               grep -v ^zhm_args /etc/default/zephyr-clients > $tmpfile || true
+               . /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
        fi
-       echo zhm_args=\"${RET}\" >> $tmpfile
-       cat $tmpfile > /etc/default/zephyr-clients
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)