From c66aa6f9018f247cf0e6c7274871dcaf7bb4daaf Mon Sep 17 00:00:00 2001 From: Karl Ramm Date: Fri, 28 Dec 2007 01:04:34 +0000 Subject: read in server.list before attempting to guess defaults? --- debian/zephyr-server.config | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'debian/zephyr-server.config') diff --git a/debian/zephyr-server.config b/debian/zephyr-server.config index a55f7a6..3d38e3e 100644 --- a/debian/zephyr-server.config +++ b/debian/zephyr-server.config @@ -3,6 +3,18 @@ . /usr/share/debconf/confmodule db_version 2.0 +db_get zephyr-server/read_conf +if test -f /etc/zephyr/server.list -a \( "$RET" = true \) +then + z="`cat /etc/zephyr/server.list`" + + if test -n "$z" + then + db_set zephyr-server/read_conf false + db_set zephyr-server/servers "$z" + fi +fi + db_get zephyr-server/servers || true if test -z "$RET" then @@ -17,17 +29,5 @@ then db_set zephyr-server/servers "$z" fi -db_get zephyr-server/read_conf -if test -f /etc/zephyr/server.list -a \( "$RET" = true \) -then - z="`cat /etc/zephyr/server.list`" - - if test -n "$z" - then - db_set zephyr-server/read_conf false - db_set zephyr-server/servers "$z" - fi -fi - db_input high zephyr-server/servers || true db_go || true -- cgit v1.2.3