diff --git a/Amelia.sh b/Amelia.sh index f5a7236..9b983cd 100644 --- a/Amelia.sh +++ b/Amelia.sh @@ -1,7 +1,7 @@ #!/bin/bash # Amelia Installer -# Version: 3.5 +# Version: 3.6 set -euo pipefail ########################################################################################### @@ -3930,14 +3930,14 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc} if [[ "${vgaconf}" == "y" ]]; then if [[ "${vendor}" == "Intel" ]]; then mkinitcpio_mods="MODULES=(i915 "${fs_mod}")" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf kms block sd-encrypt filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block sd-encrypt filesystems fsck)" elif [[ "${vendor}" == "Nvidia" ]]; then mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm "${fs_mod}")" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf block sd-encrypt filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf block sd-encrypt filesystems fsck)" vga_bootopts="modeset=1" elif [[ "${vendor}" == "AMD" ]]; then mkinitcpio_mods="MODULES=(amdgpu radeon "${fs_mod}")" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf kms block sd-encrypt filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block sd-encrypt filesystems fsck)" if [[ "${islands}" == "1" ]]; then vga_bootopts="radeon.si_support=0 amdgpu.si_support=1 amdgpu.dc=1" elif [[ "${islands}" == "2" ]]; then @@ -3950,10 +3950,10 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc} elif [[ "${vgaconf}" == "n" ]]; then if [[ "${vendor}" == "Nvidia" ]]; then mkinitcpio_mods="MODULES=("${fs_mod}" nouveau)" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf kms block sd-encrypt filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block sd-encrypt filesystems fsck)" else mkinitcpio_mods="MODULES=("${fs_mod}")" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf kms block sd-encrypt filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block sd-encrypt filesystems fsck)" fi fi @@ -3979,14 +3979,14 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc} if [[ "${vgaconf}" == "y" ]]; then if [[ "${vendor}" == "Intel" ]]; then mkinitcpio_mods="MODULES=(i915 "${fs_mod}")" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf kms block filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block filesystems fsck)" elif [[ "${vendor}" == "Nvidia" ]]; then mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm "${fs_mod}")" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf block filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf block filesystems fsck)" vga_bootopts="modeset=1" elif [[ "${vendor}" == "AMD" ]]; then mkinitcpio_mods="MODULES=(amdgpu radeon "${fs_mod}")" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf kms block filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block filesystems fsck)" if [[ "${islands}" == "1" ]]; then vga_bootopts="radeon.si_support=0 amdgpu.si_support=1 amdgpu.dc=1" elif [[ "${islands}" == "2" ]]; then @@ -3998,10 +3998,10 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc} elif [[ "${vgaconf}" == "n" ]]; then if [[ "${vendor}" == "Nvidia" ]]; then mkinitcpio_mods="MODULES=("${fs_mod}" nouveau)" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf kms block filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block filesystems fsck)" else mkinitcpio_mods="MODULES=("${fs_mod}")" - mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect modconf kms block filesystems fsck)" + mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block filesystems fsck)" fi fi @@ -4065,7 +4065,6 @@ SLICK echo " title ${entrname} linux /vmlinuz-${kernel} - initrd /${microcode}.img initrd /initramfs-${kernel}.img options rw ${boot_opts}" | tee /boot/loader/entries/arch.conf && systemctl enable systemd-boot-update ${bluetooth} ${displaymanager} ${network} ${trim} ${vm_services} @@ -4259,7 +4258,6 @@ NRG echo " title ${entrname} linux /vmlinuz-${kernel} - initrd /${microcode}.img initrd /initramfs-${kernel}.img options rw ${boot_opts}" | tee /boot/loader/entries/arch.conf && echo root:${ROOTPASSWD2} | chpasswd && @@ -4360,7 +4358,6 @@ SLICK echo " title ${entrname} linux /vmlinuz-${kernel} - initrd /${microcode}.img initrd /initramfs-${kernel}.img options rw ${boot_opts}" | tee /boot/loader/entries/arch.conf && systemctl enable systemd-boot-update ${customservices} ${trim} ${vm_services}