Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-08 01:10:26 +00:00
Code Issues Projects Releases Wiki Activity

if base not installed go to install_base_menu directly; some logging

Browse Source
This commit is contained in:
Bernhard Landauer 2017-02-23 02:00:20 +01:00
parent 1aac7b3bae
commit 7c9b49eaae
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/util-base.sh
View File

@ -337,7 +337,7 @@ uefi_bootloader() {
if [[ $(cat ${PACKAGES}) != "" ]]; then
clear
basestrap ${MOUNTPOINT} $(cat ${PACKAGES} | grep -v "systemd-boot") efibootmgr dosfstools 2>$ERR
check_for_error "uefi_bootloader" "$?"
check_for_error "$FUNCNAME" "$?"
case $(cat ${PACKAGES}) in
"grub")

12
lib/util.sh
View File

@ -290,7 +290,7 @@ rank_mirrors() {
"unstable" "-" off 2>${BRANCH}
clear
[[ ! -z "$(cat ${BRANCH})" ]] && pacman-mirrors -gib "$(cat ${BRANCH})" && \
check_for_error "branch selected: $(cat ${BRANCH})" "$?"
check_for_error "$FUNCNAME branch $(cat ${BRANCH})" "$?"
}
# Originally adapted from AIS. Added option to allow users to edit the mirrorlist.
@ -344,7 +344,7 @@ check_mount() {
check_base() {
if [[ ! -e /tmp/.base_installed ]]; then
DIALOG " $_ErrTitle " --msgbox "$_ErrNoBase" 0 0
main_menu_online
install_base_menu
fi
}
@ -356,8 +356,8 @@ inst_needed() {
# install a pkg in the chroot if not installed
check_pkg() {
if ! arch_chroot "pacman -Q $1" ; then
basestrap "$1" 2>$ERR
check_for_error "install missing pkg $1 to target." "$?"
fi
if ! arch_chroot "pacman -Q $1" ; then
basestrap "$1" 2>$ERR
check_for_error "install missing pkg $1 to target." "$?"
fi
}