Update linux-firmware install method
This commit is contained in:
parent
bf31f4b350
commit
9d8f9aeeba
1 changed files with 13 additions and 14 deletions
27
archfi
27
archfi
|
@ -727,8 +727,7 @@ installmenu(){
|
||||||
options=()
|
options=()
|
||||||
options+=("${txtselectmirrorsbycountry}" "(${txtoptional})")
|
options+=("${txtselectmirrorsbycountry}" "(${txtoptional})")
|
||||||
options+=("${txteditmirrorlist}" "(${txtoptional})")
|
options+=("${txteditmirrorlist}" "(${txtoptional})")
|
||||||
options+=("${txtinstallarchlinux}" "pacstrap base kernel")
|
options+=("${txtinstallarchlinux}" "pacstrap base kernel firmwares")
|
||||||
options+=("${txtinstallfirmware}" "(${txtoptional}) pacstrap linux-firmware")
|
|
||||||
options+=("${txtconfigarchlinux}" "")
|
options+=("${txtconfigarchlinux}" "")
|
||||||
sel=$(whiptail --backtitle "${apptitle}" --title "${txtinstallmenu}" --menu "" --cancel-button "${txtunmount}" --default-item "${nextitem}" 0 0 0 \
|
sel=$(whiptail --backtitle "${apptitle}" --title "${txtinstallmenu}" --menu "" --cancel-button "${txtunmount}" --default-item "${nextitem}" 0 0 0 \
|
||||||
"${options[@]}" \
|
"${options[@]}" \
|
||||||
|
@ -745,12 +744,8 @@ installmenu(){
|
||||||
;;
|
;;
|
||||||
"${txtinstallarchlinux}")
|
"${txtinstallarchlinux}")
|
||||||
if(installbase) then
|
if(installbase) then
|
||||||
nextitem="${txtinstallfirmware}"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
"${txtinstallfirmware}")
|
|
||||||
installfirmware
|
|
||||||
nextitem="${txtconfigarchlinux}"
|
nextitem="${txtconfigarchlinux}"
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
"${txtconfigarchlinux}")
|
"${txtconfigarchlinux}")
|
||||||
archmenu
|
archmenu
|
||||||
|
@ -798,18 +793,22 @@ installbase(){
|
||||||
else
|
else
|
||||||
return 1
|
return 1
|
||||||
fi
|
fi
|
||||||
|
options=()
|
||||||
|
options+=("linux-firmware" "(${txtoptional})" on)
|
||||||
|
sel=$(whiptail --backtitle "${apptitle}" --title "Firmwares" --checklist "" 0 0 0 \
|
||||||
|
"${options[@]}" \
|
||||||
|
3>&1 1>&2 2>&3)
|
||||||
|
if [ ! "$?" = "0" ]; then
|
||||||
|
return 1
|
||||||
|
fi
|
||||||
|
for itm in $sel; do
|
||||||
|
pkgs="$pkgs $(echo $itm | sed 's/"//g')"
|
||||||
|
done
|
||||||
echo "pacstrap /mnt ${pkgs}"
|
echo "pacstrap /mnt ${pkgs}"
|
||||||
pacstrap /mnt ${pkgs}
|
pacstrap /mnt ${pkgs}
|
||||||
pressanykey
|
pressanykey
|
||||||
}
|
}
|
||||||
|
|
||||||
installfirmware(){
|
|
||||||
clear
|
|
||||||
echo "pacstrap /mnt linux-firmware"
|
|
||||||
pacstrap /mnt linux-firmware
|
|
||||||
pressanykey
|
|
||||||
}
|
|
||||||
|
|
||||||
unmountdevices(){
|
unmountdevices(){
|
||||||
clear
|
clear
|
||||||
echo "umount -R /mnt"
|
echo "umount -R /mnt"
|
||||||
|
|
Loading…
Reference in a new issue