albert/archery
1
0
Fork 0
mirror of https://gitlab.com/prism7/archery.git synced 2025-02-15 08:29:17 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add: Changes to reflect "mkinitcpio.conf" microcode HOOK inclusion ("systemd-boot" entries configuration also affected/changed)

Browse source
This commit is contained in:
Jane Doe 2024-03-22 11:15:42 +00:00
parent a897f4c292
commit e31530470f
1 changed files with 11 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
Amelia.sh
View file

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