From: kcr <kcr@cbed1d16-5ef5-0310-b6a1-d4a37b08ba1f>
Date: Thu, 18 Dec 2008 04:40:35 +0000 (+0000)
Subject:  r237@bucket (orig r233):  kcr | 2007-12-27 20:04:34 -0500
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c98fc983177690ef9df80ea29ea1baa88d7b8de5;p=1ts-debian.git

 r237@bucket (orig r233):  kcr | 2007-12-27 20:04:34 -0500
 read in server.list before attempting to guess defaults?



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

diff --git a/zephyr/debian/zephyr-server.config b/zephyr/debian/zephyr-server.config
index a55f7a6..3d38e3e 100644
--- a/zephyr/debian/zephyr-server.config
+++ b/zephyr/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