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

Changes to adapt to the latest mkinitcpio

Browse source
This commit is contained in:
Jane Doe 2024-05-04 11:32:17 +00:00
parent f45e2e8722
commit 5b19fdb3a9
1 changed files with 17 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

32
Amelia.sh
View file

@ -3938,14 +3938,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 microcode modconf kms block sd-encrypt filesystems fsck)" mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms keymap consolefont 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 microcode modconf block sd-encrypt filesystems fsck)" mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf keymap consolefont 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 microcode modconf kms block sd-encrypt filesystems fsck)" mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms keymap consolefont 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
@ -3956,12 +3956,12 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc}
fi fi
elif [[ "${vgaconf}" == "n" ]]; then elif [[ "${vgaconf}" == "n" ]]; then
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms keymap consolefont block sd-encrypt filesystems fsck)"
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 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 microcode modconf kms block sd-encrypt filesystems fsck)"
fi fi
fi fi
@ -3986,15 +3986,15 @@ ${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)"
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block filesystems fsck)" mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard keymap consolefont 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)"
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf block filesystems fsck)" mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf keyboard keymap consolefont 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)"
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block filesystems fsck)" mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard keymap consolefont 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
@ -4004,12 +4004,12 @@ ${purple}###${nc} Chroot & Configure System ${purple}###${nc}
fi fi
fi fi
elif [[ "${vgaconf}" == "n" ]]; then elif [[ "${vgaconf}" == "n" ]]; then
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck)"
if [[ "${vendor}" == "Nvidia" ]]; then if [[ "${vendor}" == "Nvidia" ]]; then
mkinitcpio_mods="MODULES=("${fs_mod}" nouveau)" mkinitcpio_mods="MODULES=(nouveau)"
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block filesystems fsck)"
else else
mkinitcpio_mods="MODULES=("${fs_mod}")" mkinitcpio_mods="MODULES=()"
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms block filesystems fsck)"
fi fi
fi fi
@ -4159,6 +4159,7 @@ NRG
echo ' echo '
${mkinitcpio_mods} ${mkinitcpio_mods}
${mkinitcpio_hooks} ${mkinitcpio_hooks}
COMPRESSION="zstd"
COMPRESSION_OPTIONS=(-c -T$(nproc) -) COMPRESSION_OPTIONS=(-c -T$(nproc) -)
MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf && MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf &&
mkinitcpio -P && mkinitcpio -P &&
@ -4338,6 +4339,7 @@ NRG
echo ' echo '
${mkinitcpio_mods} ${mkinitcpio_mods}
${mkinitcpio_hooks} ${mkinitcpio_hooks}
COMPRESSION="zstd"
COMPRESSION_OPTIONS=(-c -T$(nproc) -) COMPRESSION_OPTIONS=(-c -T$(nproc) -)
MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf && MODULES_DECOMPRESS="yes"' | tee /etc/mkinitcpio.conf.d/custom.conf &&
mkinitcpio -P && mkinitcpio -P &&