reassign 252121 base-config
tags 252121 patch
thanks

Nothing has to be done in choose-mirror for seeding base-config
settings.

apt-setup just needs the attached patch for being able to re-use the
proxy and mirror settings which were set in 1st stage in case a
businesscard or netboot image was used.



-- 


--- apt-setup.old       2004-10-15 21:51:52.000000000 +0200
+++ apt-setup   2004-10-15 22:55:36.000000000 +0200
@@ -334,7 +334,14 @@
                db_fget apt-setup/country seen
                if [ "$RET" = "false" ]; then
                        # Set default country
-                       db_get debian-installer/country
+                       # Use choose-mirror settings if existing
+                       # Otherwise, use country from 1st stage
+                       # If choose-mirror is changed for keeping a country
+                       # name then this part of the code must be changed
+                       db_get mirror/$URI/country
+                       if [ -z "$RET" ] ; then
+                           db_get debian-installer/country
+                       fi
                        COUNTRY=$(perl -e '
                                $countrycode=shift;
                                open (T, "/usr/share/zoneinfo/iso3166.tab");
@@ -374,6 +381,11 @@
                if [ "$RET" != "enter information manually" ]; then
                        # Now prompt with the mirrors in the selected country.
                        db_subst apt-setup/mirror mirrors "`mirror_list $URI \"$RET\"`"
+                       # Get settings from 1st stage
+                       db_get mirror/$URI/mirror || true
+                       if "$RET" ; then
+                           db_set apt-setup/mirror $RET
+                       fi
                        ask_q critical apt-setup/mirror || true
                        db_go || continue
                        

Reply via email to