Revert "final_check() use mhwd check for video driver"

- first of all should have run the test in the chroot not on the host ;)
- but even when run correctly this doesn't work in many cases. For example in vbox mhwd-gpu --check returns nothing and also an mhwd config
will not be present.
- So lets just use what we already had ...

This reverts commit b49cea980f.
merge-requests/273/head
Bernhard Landauer 7 years ago
parent 1a21ebbe18
commit a6f92f0899

@ -18,6 +18,7 @@ setup_graphics_card() {
clear
arch_chroot "mhwd -f -i pci $(cat /tmp/.driver)" 2>$ERR
check_for_error "install $(cat /tmp/.driver)" $?
touch /mnt/.video_installed
GRAPHIC_CARD=$(lspci | grep -i "vga" | sed 's/.*://' | sed 's/(.*//' | sed 's/^[ \t]*//')

@ -199,10 +199,12 @@ install_graphics_menu() {
"1") clear
arch_chroot "mhwd -a pci free 0300" 2>$ERR
check_for_error "$_InstFree" $?
touch /mnt/.video_installed
;;
"2") clear
arch_chroot "mhwd -a pci nonfree 0300" 2>$ERR
check_for_error "$_InstProp" $?
touch /mnt/.video_installed
;;
"3") setup_graphics_card
;;

@ -495,7 +495,7 @@ final_check() {
$(grep -qv '^#' /mnt/etc/fstab 2>/dev/null) || echo "- $_FstabCheck" >> ${CHECKLIST}
# Check if video-driver has been installed
[[ $(mhwd-gpu --check | grep valid) ]] || echo "- $_GCCheck" >> ${CHECKLIST}
[[ ! -e /mnt/.video_installed ]] && echo "- $_GCCheck" >> ${CHECKLIST}
# Check if locales have been generated
[[ $(manjaro-chroot /mnt 'locale -a' | wc -l) -ge '3' ]] || echo "- $_LocaleCheck" >> ${CHECKLIST}

Loading…
Cancel
Save