Commit bf08cd62 authored by Matti Hyttinen's avatar Matti Hyttinen

Use hostcache correctly and also for mhwd operations

parent 99513eb6
......@@ -45,8 +45,10 @@ mk_connection
check_connection
#greeting
if [[ -e /run/miso/bootmnt ]]; then
hostcache=true
else
hostcache=false
cachepath="/mnt/var/cache/pacman/pkg/"
else
hostcache=true
cachepath="/var/cache/pacman/pkg/"
fi
main_menu
......@@ -16,7 +16,7 @@ setup_graphics_card() {
if [[ $(cat /tmp/.driver) != "" ]]; then
clear
arch_chroot "mhwd -f -i pci $(cat /tmp/.driver)" 2>$ERR
mhwd --pmcachedir "$cachepath" --pmroot $MOUNTPOINT -f -i pci $(cat /tmp/.driver) 2>$ERR
check_for_error "install $(cat /tmp/.driver)" $?
touch /mnt/.video_installed
......@@ -169,7 +169,7 @@ install_manjaro_de_wm() {
echo "" > /tmp/.desktop
# DE/WM Menu
DIALOG " $_InstDETitle " --radiolist "\n$_InstManDEBody\n$(evaluate_profiles)\n\n$_UseSpaceBar\n " 0 0 12 \
DIALOG " $_InstDETitle " --radiolist "\n$_InstManDEBody\n$(evaluate_profiles)\n\n$_UseSpaceBar\n " 0 0 14 \
$(echo $PROFILES/{manjaro,community}/* | xargs -n1 | cut -f7 -d'/' | grep -vE "netinstall|architect" | awk '$0=$0" - off"') 2> /tmp/.desktop
# If something has been selected, install
......
......@@ -598,7 +598,9 @@ set_cache()
DIALOG " $_HostCache " --yesno "\n$_HostCacheBody\n " 0 0
if [[ $? -eq 0 ]]; then
hostcache=true
cachepath="/var/cache/pacman/pkg/"
else
hostcache=false
cachepath="/mnt/var/cache/pacman/pkg/"
fi
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment