diff --git a/Misc/Arch-LuksCrpy-Install.bash b/Misc/Arch-LuksCrpy-Install.bash index 110e960..be52bb9 100755 --- a/Misc/Arch-LuksCrpy-Install.bash +++ b/Misc/Arch-LuksCrpy-Install.bash @@ -290,7 +290,7 @@ install() { echo " - ${pkg}" done - pacstrap /mnt base base-devel linux linux-headers linux-firmware neovim + pacstrap /mnt base base-devel linux linux-headers linux-firmware neovim > /dev/null log "info" "Finished installing packages" log "info" "Generating fstab" genfstab -U /mnt >> /mnt/etc/fstab @@ -304,9 +304,25 @@ install() { 127.0.1.1 arch.localdomain arch __EOF__ - echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen - locale-gen - echo "LANG=en_US.UTF-8" > /etc/locale.conf + local hooks_str + local new_hooks + while read -r; do + if [[ "${REPLY}" = "HOOKS="* ]]; then + hooks_str="${REPLY}" + hook_str="$(echo "${hooks_str}" | cut -d "(" -f2 | cut -d ")" -f1)" + for hook in hook_str; do + if [[ "${hook}" = "block" ]]; + new_hooks="${new_hooks} encrypt" + else + new_hooks="${new_hooks} ${hook}" + fi + done + echo "HOOKS=(${new_hooks})" + else + echo "${REPLY}" + fi + + done << "$(cat /etc/mkinitcpio.conf)" > /etc/mkinitcpio.conf echo "toor" | passwd root --stdin local ucode