diff --git a/install-grub.sh b/install-grub.sh index f198693..0c92190 100644 --- a/install-grub.sh +++ b/install-grub.sh @@ -345,41 +345,26 @@ echo # Install bootloader. echo "Installing GRUB." arch-chroot /mnt grub-install --target=i386-pc /dev/$dev && +sed -i '7s/.*/GRUB_CMDLINE_LINUX="cryptdevice=/dev/$main:lvm root=/dev/mapper/main-root"/' /mnt/etc/default/grub && +sed -i '10s/.*/GRUB_PRELOAD_MODULES="part_gpt part_msdos lvm"/' /mnt/etc/default/grub && arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg && echo "Done." echo # Set bootloader entry. -echo "Setting up bootloader." -cat << EOF > /mnt/boot/loader/entries/arch.conf && -title Arch Linux -linux /vmlinuz-linux-zen -#initrd /amd-ucode.img +#echo "Setting up bootloader." +#cat << EOF > /mnt/boot/loader/entries/arch.conf && +#title Arch Linux +#linux /vmlinuz-linux-zen +##initrd /amd-ucode.img #initrd /intel-ucode.img -initrd /initramfs-linux-zen.img -options cryptdevice=/dev/$main:lvm -options root=/dev/mapper/main-root rw -options lang=de locale=de_DE.UTF-8 -options init=/usr/lib/systemd/systemd +#initrd /initramfs-linux-zen.img +#options cryptdevice=/dev/$main:lvm +#options root=/dev/mapper/main-root rw +#options lang=de locale=de_DE.UTF-8 +#options init=/usr/lib/systemd/systemd #options loglevel=3 -EOF - -# Set bootloader fallback entry. -cat << EOF > /mnt/boot/loader/entries/arch-fallback.conf && -title Arch Linux Fallback -linux /vmlinuz-linux -initrd /initramfs-linux-fallback.img -options cryptdevice=/dev/$main:lvm -options root=/dev/mapper/main-root rw -options lang=de locale=de_DE.UTF-8 -options init=/usr/lib/systemd/systemd -EOF - -# Set bootloader. -echo "timeout 1" >> /mnt/boot/loader/loader.conf && -echo "default arch.conf" >> /mnt/boot/loader/loader.conf && -echo "Done." -echo +#EOF # Set username, password and group. echo "Adding user."