diff options
| author | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-18 15:51:44 +0100 |
|---|---|---|
| committer | Dieter Plaetinck <dieter@plaetinck.be> | 2008-12-18 15:51:44 +0100 |
| commit | 83df0500533e6e5b7a93b4d37df34a0952e2795b (patch) | |
| tree | de86160f07a553ac8069e55cbe0202b15ca3c0da /src/core/libs | |
| parent | c5e7eea26c1ce2305012ab67d88e54477e389ccd (diff) | |
mirrorlist scope/softcoding cleanups
Diffstat (limited to 'src/core/libs')
| -rw-r--r-- | src/core/libs/lib-pacman.sh | 2 | ||||
| -rw-r--r-- | src/core/libs/lib-ui-interactive.sh | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/core/libs/lib-pacman.sh b/src/core/libs/lib-pacman.sh index cb81943..f318aa8 100644 --- a/src/core/libs/lib-pacman.sh +++ b/src/core/libs/lib-pacman.sh @@ -76,7 +76,7 @@ do #TODO: this is a VERY, VERY dirty hack. we fall back to ftp for any non-core repo because we only have core on the CD. also user maybe didn't pick a mirror yet if [ "$repo" != core ] then - add_pacman_repo target ${repo} 'Include = /etc/pacman.d/mirrorlist' + add_pacman_repo target ${repo} "Include = $var_MIRRORLIST" else add_pacman_repo target ${repo} "Server = ${serverurl}" fi diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh index 2fdfa3e..f7f4ecb 100644 --- a/src/core/libs/lib-ui-interactive.sh +++ b/src/core/libs/lib-ui-interactive.sh @@ -38,7 +38,7 @@ interactive_configure_system() "/etc/hosts.deny" "Denied Network Services" \ "/etc/hosts.allow" "Allowed Network Services" \ "/etc/locale.gen" "Glibc Locales" \ - "/etc/pacman.d/mirrorlist" "Pacman Mirror List" \ + "$var_MIRRORLIST" "Pacman Mirror List" \ "Root-Password" "Set the root password" \ "Return" "Return to Main Menu" || FILE="Return" FILE=$ANSWER_OPTION @@ -826,7 +826,6 @@ interactive_select_source() var_PKG_SOURCE_TYPE= var_FILE_URL="file:///src/core/pkg" var_SYNC_URL= - var_MIRRORLIST="/etc/pacman.d/mirrorlist" ask_option no "Source selection" "Please select an installation source" \ "1" "CD-ROM or OTHER SOURCE" \ |