Frans Pop wrote: > Modified: trunk/packages/apt-setup/apt-setup > ============================================================================== > --- trunk/packages/apt-setup/apt-setup (original) > +++ trunk/packages/apt-setup/apt-setup Wed May 17 22:44:39 2006 > @@ -25,6 +25,39 @@ > log "warning: $@" > } > > +if [ -e /cdrom/.disk/base_installable ]; then > + if db_get cdrom/codename && [ "$RET" ]; then > + db_set mirror/codename $RET > + fi > + if db_get cdrom/suite && [ "$RET" ]; then > + db_set mirror/suite $RET > + fi > + > + db_input high apt-setup/use_mirror > + db_go > + if [ $? -eq 10 ]; then > + exit 30 > + fi > + > + db_get apt-setup/use_mirror > + if db_get mirror/protocol && [ "$RET" ]; then > + protocol=$RET > + fi > + if [ "$RET" = false ]; then > + if [ "$protocol" ]; then > + db_set mirror/$protocol/hostname "" > + db_set mirror/$protocol/directory "" > + fi > + else > + if [ "$protocol" ]; then > + if db_get mirror/$protocol/directory && [ -z "$RET ]; then > + db_reset mirror/$protocol/directory > + fi > + fi > + choose-mirror > + fi > +fi > + Shouldn't this be in 50mirror so it only asks about using a mirror if using a mirror is something it can really do? (Similarly the template should move to apt-mirror-setup.templates) I'm also not really sure why we need to ask this, at least at high priority, for a netinst install, when using a mirror is a fine default. -- see shy jo
Attachment:
signature.asc
Description: Digital signature