|
|
|
@ -318,13 +318,10 @@ install_base() {
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|
# if branch was chosen, use that also in installed system. If not, use the system setting
|
|
|
|
|
if [[ -e ${BRANCH} ]]; then
|
|
|
|
|
sed -i "/Branch =/c\Branch = $(cat ${BRANCH})/" ${MOUNTPOINT}/etc/pacman-mirrors.conf 2>$ERR
|
|
|
|
|
check_for_error "set target branch $(cat ${BRANCH})" $?
|
|
|
|
|
else
|
|
|
|
|
sed -i "/Branch =/c\ $(grep "Branch =" /etc/pacman-mirrors.conf | sed 's|.*B\(.*\)|B\1|')" ${MOUNTPOINT}/etc/pacman-mirrors.conf 2>$ERR
|
|
|
|
|
check_for_error "use host branch: $(grep "Branch =" /etc/pacman-mirrors.conf | cut -d' ' -f3)" $?
|
|
|
|
|
fi
|
|
|
|
|
[[ ! -e ${BRANCH} ]] && echo "$(grep -oE -m 1 "unstable|stable|testing" /etc/pacman.d/mirrorlist)" > ${BRANCH}
|
|
|
|
|
sed -i "s/Branch =.*/Branch = $(cat${BRANCH})/;s/# //" ${MOUNTPOINT}/etc/pacman-mirrors.conf 2>$ERR
|
|
|
|
|
check_for_error "use host branch: $(cat${BRANCH})" $?
|
|
|
|
|
|
|
|
|
|
touch /mnt/.base_installed
|
|
|
|
|
check_for_error "base installed succesfully."
|
|
|
|
|
install_network_drivers
|
|
|
|
|