diff options
author | Karl Ramm <kcr@mit.edu> | 2007-12-28 01:04:34 +0000 |
---|---|---|
committer | Karl Ramm <kcr@mit.edu> | 2007-12-28 01:04:34 +0000 |
commit | c66aa6f9018f247cf0e6c7274871dcaf7bb4daaf (patch) | |
tree | ceccec9bdd0c5836032b8d9022ce36cf23311a5b /debian | |
parent | d7f617d723fbe63cf4d5fd97b95f4007d8127c11 (diff) |
read in server.list before attempting to guess defaults?
Diffstat (limited to 'debian')
-rw-r--r-- | debian/zephyr-server.config | 24 |
1 files changed, 12 insertions, 12 deletions
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 |