From 91ab9cee8da0165119b640b0e54eb78097c57beb Mon Sep 17 00:00:00 2001 From: Gerhard Brauer <gerbra@archlinux.de> Date: Mon, 26 Jan 2009 14:54:38 +0100 Subject: [PATCH 8/8] Corrected false mirrorlist generating on ftp install On ftp install the seleced mirror has "core" hardcoded in URL instead of $repo, which is the correct syntax when the mirror goes to the pacman.d/mirrorlist file during configuration. This will fix FS#12944 but is only a quick fix. We will handle this better in new installer. Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- setup | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/setup b/setup index c676396..40d367c 100755 --- a/setup +++ b/setup @@ -1273,7 +1273,8 @@ configure_system() # /etc/pacman.d/mirrorlist # add installer-selected mirror to the top of the mirrorlist if [ "$MODE" = "ftp" -a "${SYNC_URL}" != "" ]; then - awk "BEGIN { printf(\"# Mirror used during installation\nServer = "${SYNC_URL}"\n\n\") } 1 " "${DESTDIR}/etc/pacman.d/mirrorlist" > /tmp/inst-mirrorlist + SEL_MIRROR=$(echo "${SYNC_URL}" | sed s/core/\$repo/g) + awk "BEGIN { printf(\"# Mirror used during installation\nServer = "${SEL_MIRROR}"\n\n\") } 1 " "${DESTDIR}/etc/pacman.d/mirrorlist" > /tmp/inst-mirrorlist mv /tmp/inst-mirrorlist "${DESTDIR}/etc/pacman.d/mirrorlist" fi -- 1.6.1.1