zephyr-clients.config zephyr-client.templates:

  check for existence of /etc/zephyr/server.list and read it
  send a note if no servers are configured

zephyr-clients.init:
  don't speculate as to why no servers are configured

zephyr-server.config:
  be slightly cleverer about reading /etc/zephyr/server.list

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

diff --git a/debian/changelog b/debian/changelog
index ee535aef5597812097f5dc4184ba4419b9dc8860..684bd901c8d1e81cf753a143f6d036ef60c18a38 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+zephyr (2.1.20010518.SNAPSHOT-2) unstable; urgency=low
+
+  * On linux/alpha, timeval is 16 bytes.  Unfortunately, the protocol is
+    defined in terms of sizeof(struct timeval). Ooops. closes: #99158
+  * streamline server config script
+  * have client config script check for existence of /etc/zephyr/servers.list
+
+ -- Karl Ramm <kcr@debian.org>  Wed, 25 Jul 2001 06:00:47 -0400
+
 zephyr (2.1.20010518.SNAPSHOT-1) unstable; urgency=low
 
   * fix typo in zephyr-server config script

diff --git a/debian/zephyr-clients.config b/debian/zephyr-clients.config
index 2eada48eba5c7857aa79cb3f2dd2efc2a12a3ea0..f5922cf3e2b0493e22e48c61c56f52bb5d24ace5 100644 (file)
--- a/debian/zephyr-clients.config
+++ b/debian/zephyr-clients.config
@@ -6,11 +6,22 @@ db_version 2.0
 db_get zephyr-clients/servers || true
 if test -z "$RET"
 then
-       # if there happens to be a zephyr server running on this machine,
-        # see what its debconf knows about zephyr servers...
-       if db_get zephyr-server/servers && -n "$RET"
+       # If there's an /etc/zephyr/server.list file lying around, read it
+       if test -f /etc/zephyr/server.list
        then
-               db_set zephyr-clients/servers $RET
+               z="`cat /etc/zephyr/server.list`"
+       
+               if test -n "$z"
+               then
+                   db_set zephyr-clients/servers "$z"
+               fi
+       else
+               # if there happens to be zephyr server decconf on this machine,
+               # see what its debconf knows about zephyr servers...
+               if db_get zephyr-server/servers && test -n "$RET"
+               then
+                       db_set zephyr-clients/servers $RET
+               fi
        fi
 fi
 
@@ -27,4 +38,12 @@ then
 fi
 
 db_input high zephyr-clients/servers || true
+
 db_go
+
+db_get zephyr-clients/servers
+if test -z "$RET"
+then
+    db_input high zephyr-clients/need-servers || true
+    db_go
+fi

diff --git a/debian/zephyr-clients.init b/debian/zephyr-clients.init
index bfed4a7cd61e3a6cb316384b6f036e72e778487e..ac4c2a4e085aa53b4d6e79c4bd5ba4440fb0996f 100644 (file)
--- a/debian/zephyr-clients.init
+++ b/debian/zephyr-clients.init
@@ -31,11 +31,10 @@ case "$1" in
        if test -z "$zhm_args"
        then
                cat <<EOF
-The zephyr-clients package for whatever reason does not have any zephyr servers
-configured.  This is often because you have the threshold for debconf 
-asking question cranked up too high but regardless, please edit the file
-/etc/default/zephyr-clients and add the names of your zephyr servers, seperated
-by spaces to the zhm_args variable.
+The zephyr-clients package for whatever reason does not have any zephyr
+servers configured. Please edit the file /etc/default/zephyr-clients and
+add the names of your zephyr servers, seperated by spaces, to the
+zhm_args variable.
 EOF
                exit 0
        fi

diff --git a/debian/zephyr-clients.templates b/debian/zephyr-clients.templates
index 16a1b5c058f6a049c0af474af3508797d98f6c71..04063e8dec948321e7566490bbdab6d4412c56c1 100644 (file)
--- a/debian/zephyr-clients.templates
+++ b/debian/zephyr-clients.templates
@@ -14,3 +14,11 @@ Description: You should never see this
  before the postinst is run.  Thus we may read the wrong value before the 
  edited value is written out in postinst.
  If this is false we skip reading config files until postinst runs.
+
+Template: zephyr-clients/need-servers
+Type: note
+Description: You have no zephyr servers specified for the client
+ The zephyr-clients package for whatever reason does not
+ have any zephyr servers configured.  Please edit the file
+ /etc/default/zephyr-clients and add  the names of your zephyr
+ servers, seperated by spaces to the zhm_args variable.

diff --git a/debian/zephyr-server.config b/debian/zephyr-server.config
index 720dda1dcaf88e2026767d7e7d9258660d6650e9..2050dc0ec5f2079079f54d0670fc1b967fa6fd37 100644 (file)
--- a/debian/zephyr-server.config
+++ b/debian/zephyr-server.config
@@ -20,18 +20,10 @@ fi
 db_get zephyr-server/read_conf
 if test -f /etc/zephyr/server.list -a \( "$RET" = true \)
 then
-       z=""
-       while read x
-       do
-               z="$z $x"
-       done < /etc/zephyr/server.list
+       z="`cat /etc/zephyr/server.list`"
        
        if test -n "$z"
        then
-               # remove exterraneous whitespace
-               set $z
-               z="$*"
-
                db_set zephyr-server/read_conf false
                db_set zephyr-server/servers "$z"
        fi