mirror of
https://gitlab.com/prism7/archery.git
synced 2026-04-28 17:37:36 +02:00
Change: 'Graphics Setup' stage > Nvidia Proprietary driver:
If other than 'Nvidia' GPU vendors are also detected in the system, the installer will not remove the 'KMS' hook from '/etc/mkinitcpio.conf.d/mkinitcpiod.conf' HOOK array since the 'nouveau' module will be blacklisted anyway by the 'nvidia-utils' package after rebooting. This enables other vendor's graphics device(s), if needed.
This commit is contained in:
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# Amelia Installer
|
# Amelia Installer
|
||||||
# Source: https://gitlab.com/prism7/archery
|
# Source: https://gitlab.com/prism7/archery
|
||||||
# Version: 8.10.0
|
# Version: 8.10.1
|
||||||
|
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
###################################################################################################
|
###################################################################################################
|
||||||
@@ -1861,7 +1861,7 @@ vgapkgs_set() {
|
|||||||
sleep 0.2
|
sleep 0.2
|
||||||
RED "
|
RED "
|
||||||
----------------------------------------------------------------
|
----------------------------------------------------------------
|
||||||
### ${yellowl}WARNING: ${nc}${yellow}When ${nc}Hibernating ${red}###
|
### ${yellowl}INFO: ${nc}${yellow}When ${nc}Hibernating ${red}###
|
||||||
|
|
||||||
### ${yellow}Nvidia's ${nc}'Preserve Video Memory after suspend' ${yellow}feature ${red}###
|
### ${yellow}Nvidia's ${nc}'Preserve Video Memory after suspend' ${yellow}feature ${red}###
|
||||||
|
|
||||||
@@ -6014,8 +6014,14 @@ set_vars() {
|
|||||||
elif [[ "${vendor}" == "Nvidia" ]]; then
|
elif [[ "${vendor}" == "Nvidia" ]]; then
|
||||||
# Mkinitcpio Modules (Encryption) [Nvidia KMS]
|
# Mkinitcpio Modules (Encryption) [Nvidia KMS]
|
||||||
mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm ${fs_mod})"
|
mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm ${fs_mod})"
|
||||||
# Mkinitcpio Hooks (Encryption)
|
# Configure KMS setting
|
||||||
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf sd-vconsole block sd-encrypt filesystems fsck)"
|
if [[ "${intelcount}" -ge "1" || "${amdcount}" -ge "1" ]]; then
|
||||||
|
# Multi GPU Vendor Mkinitcpio Hooks (Encryption)
|
||||||
|
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)"
|
||||||
|
else
|
||||||
|
# Nvidia GPU Vendor Mkinitcpio Hooks (Encryption)
|
||||||
|
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf sd-vconsole block sd-encrypt filesystems fsck)"
|
||||||
|
fi
|
||||||
# Graphics Kernel Parameters
|
# Graphics Kernel Parameters
|
||||||
vga_bootopts=(nvidia.NVreg_UsePageAttributeTable=1)
|
vga_bootopts=(nvidia.NVreg_UsePageAttributeTable=1)
|
||||||
|
|
||||||
@@ -6101,8 +6107,14 @@ set_vars() {
|
|||||||
elif [[ "${vendor}" == "Nvidia" ]]; then
|
elif [[ "${vendor}" == "Nvidia" ]]; then
|
||||||
# Mkinitcpio Modules [Nvidia KMS]
|
# Mkinitcpio Modules [Nvidia KMS]
|
||||||
mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)"
|
mkinitcpio_mods="MODULES=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)"
|
||||||
# Mkinitcpio Hooks
|
# Configure KMS setting
|
||||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf keyboard sd-vconsole block filesystems fsck)"
|
if [[ "${intelcount}" -ge "1" || "${amdcount}" -ge "1" ]]; then
|
||||||
|
# Multi GPU Vendor Mkinitcpio Hooks
|
||||||
|
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)"
|
||||||
|
else
|
||||||
|
# Nvidia GPU Vendor Mkinitcpio Hooks
|
||||||
|
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf keyboard sd-vconsole block filesystems fsck)"
|
||||||
|
fi
|
||||||
# Graphics Kernel Parameters
|
# Graphics Kernel Parameters
|
||||||
vga_bootopts=(nvidia.NVreg_UsePageAttributeTable=1)
|
vga_bootopts=(nvidia.NVreg_UsePageAttributeTable=1)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user