1
0
mirror of https://github.com/tommytran732/Arch-Setup-Script synced 2024-11-09 20:21:34 -05:00

Update install.sh

This commit is contained in:
TommyTran732 2021-06-14 21:39:50 -04:00 committed by tommytran732
parent 9f2a5d5a8d
commit 4b7fa4329b
No known key found for this signature in database
GPG Key ID: 060B29EB996BD9F2

View File

@ -159,7 +159,7 @@ kernel_selector
# Pacstrap (setting up a base sytem onto the new root). # Pacstrap (setting up a base sytem onto the new root).
echo "Installing the base system (it may take a while)." echo "Installing the base system (it may take a while)."
pacstrap /mnt base base-devel ${kernel} ${kernel}-headers ${microcode} linux-firmware grub grub-btrfs snapper efibootmgr sudo networkmanager apparmor pipewire pipewire-pulse pipewire-alsa pipewire-jack nano gnome-shell gdm gnome-control-center gnome-terminal gnome-software gnome-software-packagekit-plugin gnome-tweaks nautilus flatpak xdg-user-dirs firewalld exfatprogs ntfs-3g f2fs-tools udftools adobe-source-han-sans-otc-fonts adobe-source-han-serif-otc-fonts reflector man-db pacstrap /mnt base base-devel ${kernel} ${kernel}-headers ${microcode} linux-firmware grub grub-btrfs snapper efibootmgr sudo networkmanager apparmor pipewire pipewire-pulse pipewire-alsa pipewire-jack nano gnome-shell gdm gnome-control-center gnome-terminal gnome-software gnome-software-packagekit-plugin gnome-tweaks nautilus flatpak xdg-user-dirs firewalld exfatprogs ntfs-3g f2fs-tools udftools adobe-source-han-sans-otc-fonts adobe-source-han-serif-otc-fonts reflector man-db snap-pac
# Generating /etc/fstab. # Generating /etc/fstab.
echo "Generating a new fstab." echo "Generating a new fstab."
@ -197,6 +197,9 @@ UUID=$(blkid $cryptroot | cut -f2 -d'"')
sed -i 's/#\(GRUB_ENABLE_CRYPTODISK=y\)/\1/' /mnt/etc/default/grub sed -i 's/#\(GRUB_ENABLE_CRYPTODISK=y\)/\1/' /mnt/etc/default/grub
echo "" >> /mnt/etc/default/grub echo "" >> /mnt/etc/default/grub
echo -e "# Booting with BTRFS subvolume\nGRUB_BTRFS_OVERRIDE_BOOT_PARTITION_DETECTION=true" >> /mnt/etc/default/grub echo -e "# Booting with BTRFS subvolume\nGRUB_BTRFS_OVERRIDE_BOOT_PARTITION_DETECTION=true" >> /mnt/etc/default/grub
sed -i 's# part_msdos##g' /mnt/default/grub
sed -i 's#"rootflags=subvol=${rootsubvol} ##g' /mnt/etc/grub.d/10_linux
sed -i 's#"rootflags=subvol=${rootsubvol} ##g' /mnt/etc/grub.d/20_linux_xen
# Adding keyfile to the initramfs to avoid double password. # Adding keyfile to the initramfs to avoid double password.
dd bs=512 count=4 if=/dev/random of=/mnt/cryptkey/.root.key iflag=fullblock &>/dev/null dd bs=512 count=4 if=/dev/random of=/mnt/cryptkey/.root.key iflag=fullblock &>/dev/null
@ -267,14 +270,12 @@ arch-chroot /mnt /bin/bash -e <<EOF
# Installing GRUB. # Installing GRUB.
echo "Installing GRUB on /boot." echo "Installing GRUB on /boot."
grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=GRUB --modules="normal test efi_gop efi_uga search echo linux all_video gfxmenu gfxterm_background gfxterm_menu gfxterm png jpeg part_msdos loadenv luks2" --disable-shim-lock &>/dev/null grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=GRUB --modules="normal test efi_gop efi_uga search echo linux all_video gfxmenu gfxterm_background gfxterm_menu gfxterm png jpeg oadenv luks2 tpm" --disable-shim-lock &>/dev/null
#sed -i 's#"rootflags=subvol=${rootsubvol} ##g' /etc/grub.d/10_linux
#sed -i 's#"rootflags=subvol=${rootsubvol} ##g' /etc/grub.d/20_linux_xen
# Creating grub config file. # Creating grub config file.
echo "Creating GRUB config file." echo "Creating GRUB config file."
grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null grub-mkconfig -o /boot/grub/grub.cfg &>/dev/null
pacman -S --noconfirm snap-pac
EOF EOF
# Setting root password. # Setting root password.