From 4f2ba22b47752c3ce013fa5e3f62a845a29da813 Mon Sep 17 00:00:00 2001
From: Dieter Plaetinck <dieter@plaetinck.be>
Date: Mon, 10 Nov 2008 19:13:39 +0100
Subject: mirrorlist fix (maybe) + todo updates

---
 TODO                                | 7 +++++--
 src/core/libs/lib-ui-interactive.sh | 4 ++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/TODO b/TODO
index 239d386..c3c1e23 100644
--- a/TODO
+++ b/TODO
@@ -3,7 +3,10 @@ See also the FIXME's and TODO's in the code.
 
 PRE-ALPHA PHASE: get it sort of reasonably working
 * core/interactive bug: -> configure system -> fstab (/mnt/etc/fstab) does only contain pts,shm and floppy/dvd/cdrom. not hd's?  ->this breaks the boot procedure!
-
+-> fixed i think
+* no default mirrorlist? -> fixed i think
+* can't return to main menu after mirror selection/network setup. maybe because network setup failed
+(if i say network is ok, it's ok though)
 
 
 ALPHA PHASE: get some people to test and suggest ideas, while fixing bugs
@@ -33,7 +36,7 @@ BETA PHASE: try to get fifa on the (beta) installcd as an experimental, alternat
 * involve broader community
 * setup bugtracker/roadmap thingie
 * fix everything
-
+* if dhcpd already runs for $reason, the installer will try again @ configure network and fail
 
 PRODUCTION PHASE: totally replace /arch/setup and /arch/quickinst
 * fix everything even more
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 1ccb471..a35ae90 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -670,7 +670,7 @@ interactive_select_source()
 interactive_select_mirror() { 
         notify "Keep in mind ftp.archlinux.org is throttled.\nPlease select another mirror to get full download speed."
         # FIXME: this regex doesn't honor commenting
-        MIRRORS=$(egrep -o '((ftp)|(http))://[^/]*' "${MIRRORLIST}" | sed 's|$| _|g')
+        MIRRORS=$(egrep -o '((ftp)|(http))://[^/]*' "${var_MIRRORLIST}" | sed 's|$| _|g')
         _dia_DIALOG --menu "Select an FTP/HTTP mirror" 14 55 7 \
                   $MIRRORS \
                   "Custom" "_" 2>$ANSWER || return 1
@@ -684,7 +684,7 @@ interactive_select_mirror() {
         # our mirrorlist and pulling the full URL out. Substitute 'core' in  
         # for the repository name, and ensure that if it was listed twice we 
         # only return one line for the mirror.
-        var_SYNC_URL=$(egrep -o "${_server}.*" "${MIRRORLIST}" | sed 's/\$repo/core/g' | head -n1)
+        var_SYNC_URL=$(egrep -o "${_server}.*" "${var_MIRRORLIST}" | sed 's/\$repo/core/g' | head -n1)
     fi
     echo "Using mirror: $var_SYNC_URL" >$LOG
 }
-- 
cgit v1.2.3-54-g00ecf