summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/libs/lib-pacman.sh2
-rw-r--r--src/core/libs/lib-software.sh2
-rw-r--r--src/core/libs/lib-ui-interactive.sh3
-rw-r--r--src/core/procedures/base2
4 files changed, 4 insertions, 5 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-software.sh b/src/core/libs/lib-software.sh
index af26137..6b4a1a8 100644
--- a/src/core/libs/lib-software.sh
+++ b/src/core/libs/lib-software.sh
@@ -26,7 +26,7 @@ run_mkinitcpio()
installpkg() {
notify "Package installation will begin now. You can watch the output in the progress window. Please be patient."
target_special_fs on
- run_background pacman-installpkg "$PACMAN_TARGET -S $TARGET_PACKAGES" $TMP_PACMAN_LOG
+ run_background pacman-installpkg "$PACMAN_TARGET -S $TARGET_PACKAGES" $TMP_PACMAN_LOG #TODO: There may be something wrong here. See http://projects.archlinux.org/?p=installer.git;a=commitdiff;h=f504e9ecfb9ecf1952bd8dcce7efe941e74db946 ASKDEV (Simo)
follow_progress " Installing... Please Wait " $TMP_PACMAN_LOG
wait_for pacman-installpkg
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" \
diff --git a/src/core/procedures/base b/src/core/procedures/base
index 3c2a54f..fa88210 100644
--- a/src/core/procedures/base
+++ b/src/core/procedures/base
@@ -5,6 +5,7 @@ var_DEFAULTFS="/boot:32:ext2:+ swap:256:swap /:7500:ext3 /home:*:ext3"
var_TARGET_DIR="/mnt" # When overriding this, do _not_ add a trailing /. It's not needed and maybe you could even break something
var_RUNTIME_PACKAGES=
var_PKG_FILE=$RUNTIME_DIR/package-list
+var_MIRRORLIST="/etc/pacman.d/mirrorlist"
var_UI_TYPE="cli" # set to cli or dia for dialog
###### Phases ( can be overridden by more specific procedures) ######
@@ -64,7 +65,6 @@ worker_select_source ()
var_PKG_SOURCE_TYPE='cd'
var_FILE_URL="file:///src/core/pkg"
var_SYNC_URL=
- var_MIRRORLIST="/etc/pacman.d/mirrorlist"
# if you override to use ftp (or ask user and he chooses ftp) don't forget to configure the network and to select_mirrors
}