diff --git a/0-preinstall.sh b/0-preinstall.sh index e4f5d54..4694b68 100644 --- a/0-preinstall.sh +++ b/0-preinstall.sh @@ -116,13 +116,17 @@ echo "--------------------------------------" echo "-- Bootloader Systemd Installation --" echo "--------------------------------------" bootctl install --esp-path=/mnt/boot -[ ! -d "/mnt/boot/loader/entries" ] && mkdir -p /mnt/boot/loader/entries -cat < /mnt/boot/loader/entries/arch.conf -title Arch Linux -linux /vmlinuz-linux-hardened -initrd /initramfs-linux-hardened.img -options root=LABEL=ROOT rw rootflags=subvol=@ -EOF +sudo cp /boot/loader/entries/arch.conf /boot/loader/entries/arch-hardened.conf +sudo sed -i 's|Arch Linux|Arch Linux Hardened Kernel|g' /boot/loader/entries/arch-hardened.conf +sudo sed -i 's|vmlinuz-linux-hardened|vmlinuz-linux-lts|g' /boot/loader/entries/arch-hardened.conf +sudo sed -i 's|initramfs-linux.img|initramfs-linux-hardened.img|g' /boot/loader/entries/arch-hardened.conf +#[ ! -d "/mnt/boot/loader/entries" ] && mkdir -p /mnt/boot/loader/entries +#cat < /mnt/boot/loader/entries/arch.conf +#title Arch Linux +#linux /vmlinuz-linux-hardened +#initrd /initramfs-linux-hardened.img +#options root=LABEL=ROOT rw rootflags=subvol=@ +#EOF cp -R ${SCRIPT_DIR} /mnt/root/BetterArch cp /etc/pacman.d/mirrorlist /mnt/etc/pacman.d/mirrorlist echo "--------------------------------------" diff --git a/1-setup.sh b/1-setup.sh index 9471e65..6df698c 100644 --- a/1-setup.sh +++ b/1-setup.sh @@ -20,7 +20,6 @@ echo "Setting up mirrors for optimal download " echo "-------------------------------------------------" pacman -S --noconfirm pacman-contrib curl pacman -S --noconfirm reflector rsync -iso=$(curl -4 ifconfig.co/country-iso) cp /etc/pacman.d/mirrorlist /etc/pacman.d/mirrorlist.bak nc=$(grep -c ^processor /proc/cpuinfo) @@ -32,6 +31,7 @@ if [[ $TOTALMEM -gt 8000000 ]]; then sudo sed -i 's/#MAKEFLAGS="-j2"/MAKEFLAGS="-j$nc"/g' /etc/makepkg.conf echo "Changing the compression settings for "$nc" cores." sudo sed -i 's/COMPRESSXZ=(xz -c -z -)/COMPRESSXZ=(xz -c -T $nc -z -)/g' /etc/makepkg.conf +fi echo "-------------------------------------------------" echo " Setup Language to US and set locale "