Merge branch 'master' into 'zfs'

# Conflicts:
#   lib/util-base.sh
#   lib/util.sh

lib/util-base.sh

@@ -380,7 +380,11 @@ install_grub_uefi() {
     else
         bootid="manjaro"
     fi
-    
+    # For quiet grub, remove fsck
+    if grep "^HOOKS"  ${MOUNTPOINT}/etc/mkinitcpio.conf | grep -q fsck; then
+        sed -e '/^HOOKS=/s/\ fsck//g' -i ${MOUNTPOINT}/etc/mkinitcpio.conf
+        arch_chroot "mkinitcpio -P" 
+    fi
     clear
     if $(mount | awk '$3 == "/mnt" {print $0}' | grep btrfs | grep -qv subvolid=5) ; then 
         basestrap ${MOUNTPOINT} grub-btrfs efibootmgr dosfstools 2>$ERR
@@ -648,7 +652,11 @@ bios_bootloader() {
 
                 basestrap ${MOUNTPOINT} grub-theme-manjaro 2>$ERR
                 check_for_error "$FUNCNAME grub" $?
-
+                # For quiet grub, remove fsck
+                if grep "^HOOKS"  ${MOUNTPOINT}/etc/mkinitcpio.conf | grep -q fsck; then
+                    sed -e '/^HOOKS=/s/\ fsck//g' -i ${MOUNTPOINT}/etc/mkinitcpio.conf
+                    arch_chroot "mkinitcpio -P" 
+                fi
             fi
         else
             # Syslinux

lib/util-disk.sh

@@ -256,7 +256,7 @@ select_filesystem() {
             ;;
         "btrfs") FILESYSTEM="mkfs.btrfs -f"
             CHK_NUM=16
-            fs_opts="autodefrag compress=zlib compress=lzo compress=no compress-force=zlib compress-force=lzo discard \
+            fs_opts="autodefrag compress=zlib compress=lzo compress=zstd compress=no compress-force=zlib compress-force=lzo compress-force=zstd discard \
             noacl noatime nodatasum nospace_cache recovery skip_balance space_cache nossd ssd ssd_spread commit=120"
             modprobe btrfs
             ;;

lib/util.sh

@@ -93,6 +93,21 @@ VB_MOD=""        # headers packages to install depending on kernel(s)
 SHOW_ONCE=0      # Show de_wm information only once
 COPY_PACCONF=0   # Copy over installer /etc/pacman.conf to installed system?
 
+GRAPHIC_CARD=$(lspci | grep -i "vga" | sed 's/.*://' | sed 's/(.*//' | sed 's/^[ \t]*//')
+    # Set microcode based on hardware. Extra work is needed for NVIDIA
+    if  [[ $(echo $GRAPHIC_CARD | grep -i "nvidia") != "" ]]; then
+        MODULE="nouveau"
+        # If NVIDIA, first need to know the integrated GC
+        [[ $(lscpu | grep -i "intel\|lenovo") != "" ]] && MCODE=intel    
+    # All non-NVIDIA cards / virtualisation
+    elif [[ $(echo $GRAPHIC_CARD | grep -i 'intel\|lenovo') != "" ]]; then MCODE=intel
+        MODULE="i915"
+    elif [[ $(echo $GRAPHIC_CARD | grep -i 'ati') != "" ]]; then MCODE=amd
+        MODULE="amdgpu radeon"
+    elif [[ $(echo $GRAPHIC_CARD | grep -i 'virtualbox') != "" ]]; then HIGHLIGHT_SUB_GC=8
+    else MCODE="all"
+    fi
+
 import(){
     if [[ -r $1 ]];then
         source $1
@@ -552,7 +567,7 @@ final_check() {
         # Check if bootloader is installed
         if [[ $SYSTEM == "BIOS" ]]; then
             arch_chroot "pacman -Qq grub" &> /dev/null || echo "- $_BootlCheck" >> ${CHECKLIST}
-        elif ! [[ -e ${MOUNTPOINT}${UEFI_MOUNT}/EFI/manjaro_grub/grubx64.efi ]] && ! [[ -e ${MOUNTPOINT}${UEFI_MOUNT}/EFI/refind/refind_x64.efi ]] && ! [[ -e ${MOUNTPOINT}${UEFI_MOUNT}/EFI/systemd/systemd-bootx64.efi ]]; then
+        elif ! [[ -e ${MOUNTPOINT}${UEFI_MOUNT}/EFI/Manjaro/grubx64.efi ]] && ! [[ -e ${MOUNTPOINT}${UEFI_MOUNT}/EFI/refind/refind_x64.efi ]] && ! [[ -e ${MOUNTPOINT}${UEFI_MOUNT}/EFI/systemd/systemd-bootx64.efi ]]; then
             echo "- $_BootlCheck" >> ${CHECKLIST}
         fi