mirror of
https://gitlab.com/prism7/archery.git
synced 2025-02-15 08:29:17 +01:00
Change 'mkinitcpio' hooks 'keymap, consolefont' to 'sd-vconsole' as systemd is being used.
This commit is contained in:
16
Amelia.sh
16
Amelia.sh
@@ -4561,11 +4561,11 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot &
|
||||
# Mkinitcpio Modules (Encryption)
|
||||
mkinitcpio_mods="MODULES=(i915 ${fs_mod})"
|
||||
# Mkinitcpio Hooks (Encryption)
|
||||
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms keymap consolefont block sd-encrypt filesystems fsck)"
|
||||
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)"
|
||||
# Nvidia
|
||||
elif [[ "${vendor}" == "Nvidia" ]]; then
|
||||
# Mkinitcpio Hooks (Encryption)
|
||||
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf keymap consolefont block sd-encrypt filesystems fsck)"
|
||||
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf sd-vconsole block sd-encrypt filesystems fsck)"
|
||||
# Preserve-Nvidia-Video-Memory after suspend/hibernate/resume
|
||||
if [[ ${nvidia_suspend} == "y" ]]; then
|
||||
# Mkinitcpio Modules (Encryption) [No Early Nvidia KMS]
|
||||
@@ -4591,7 +4591,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot &
|
||||
# Mkinitcpio Modules (Encryption)
|
||||
mkinitcpio_mods="MODULES=(amdgpu radeon ${fs_mod})"
|
||||
# Mkinitcpio Hooks (Encryption)
|
||||
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms keymap consolefont block sd-encrypt filesystems fsck)"
|
||||
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)"
|
||||
# 'Southern Islands' support
|
||||
if [[ "${islands}" == "1" ]]; then
|
||||
# Graphics Kernel Boot Options
|
||||
@@ -4608,7 +4608,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot &
|
||||
## Configuration = 'No'
|
||||
elif [[ "${vgaconf}" == "n" ]]; then
|
||||
# Mkinitcpio Hooks (Encryption)
|
||||
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms keymap consolefont block sd-encrypt filesystems fsck)"
|
||||
mkinitcpio_hooks="HOOKS=(systemd keyboard autodetect microcode modconf kms sd-vconsole block sd-encrypt filesystems fsck)"
|
||||
# Nvidia
|
||||
if [[ "${vendor}" == "Nvidia" ]]; then
|
||||
# Mkinitcpio Modules (Encryption)
|
||||
@@ -4633,11 +4633,11 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot &
|
||||
# Mkinitcpio Modules
|
||||
mkinitcpio_mods="MODULES=(i915)"
|
||||
# Mkinitcpio Hooks
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck)"
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)"
|
||||
# Nvidia
|
||||
elif [[ "${vendor}" == "Nvidia" ]]; then
|
||||
# Mkinitcpio Hooks
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf keyboard keymap consolefont block filesystems fsck)"
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf keyboard sd-vconsole block filesystems fsck)"
|
||||
# Preserve-Nvidia-Video-Memory after suspend/hibernate/resume
|
||||
if [[ ${nvidia_suspend} == "y" ]]; then
|
||||
# Mkinitcpio Modules [No Early Nvidia KMS]
|
||||
@@ -4663,7 +4663,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot &
|
||||
# Mkinitcpio Modules
|
||||
mkinitcpio_mods="MODULES=(amdgpu radeon)"
|
||||
# Mkinitcpio Hooks
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck)"
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)"
|
||||
# 'Southern Islands' support
|
||||
if [[ "${islands}" == "1" ]]; then
|
||||
# Graphics Kernel Boot Options
|
||||
@@ -4680,7 +4680,7 @@ ${magenta}###${nc}--------------------------------${magenta}[ ${bwhite}Chroot &
|
||||
## Configuration = 'No'
|
||||
elif [[ "${vgaconf}" == "n" ]]; then
|
||||
# Mkinitcpio Hooks
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard keymap consolefont block filesystems fsck)"
|
||||
mkinitcpio_hooks="HOOKS=(systemd autodetect microcode modconf kms keyboard sd-vconsole block filesystems fsck)"
|
||||
# Nvidia
|
||||
if [[ "${vendor}" == "Nvidia" ]]; then
|
||||
# Mkinitcpio Modules
|
||||
|
Reference in New Issue
Block a user