From d82d04ef5c5f99281a6291927712a1e42844361f Mon Sep 17 00:00:00 2001 From: amy Date: Mon, 31 Jan 2022 15:14:20 +0000 Subject: [PATCH 1/2] Update citrine.internal.sh --- citrine.internal.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/citrine.internal.sh b/citrine.internal.sh index ad508bf..d27fd90 100755 --- a/citrine.internal.sh +++ b/citrine.internal.sh @@ -227,7 +227,7 @@ else fi inf "Verifying network connection" -ping -c 1 getcryst.al +ping -c 1 ginp.archlinux.org if [[ ! "$?" == "0" ]]; then dumptitle="Error!" @@ -501,4 +501,4 @@ fi inf "setting up timeshift" arch-chroot /mnt timeshift --btrfs -inf "Installation should now be complete." \ No newline at end of file +inf "Installation should now be complete." From a484c325fbbd9805a98352cddfa1d3baeff4b7da Mon Sep 17 00:00:00 2001 From: Amy Date: Mon, 31 Jan 2022 17:40:50 +0100 Subject: [PATCH 2/2] refind? more like refound (Replaced refind and syslinux with grub) --- citrine.internal.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/citrine.internal.sh b/citrine.internal.sh index d27fd90..e50851a 100755 --- a/citrine.internal.sh +++ b/citrine.internal.sh @@ -246,10 +246,10 @@ fi if [[ "$EFI" == "yes" ]]; then inf "Installing EFI support packages" - crystalstrap /mnt efibootmgr refind + crystalstrap /mnt efibootmgr grub else inf "Installing Syslinux bootloader" - crystalstrap /mnt syslinux + crystalstrap /mnt grub fi genfstab -U /mnt > /mnt/etc/fstab @@ -357,14 +357,12 @@ echo "# Enabled by Crystalinstall (citrine)" >> /mnt/etc/sudoers echo "%wheel ALL=(ALL) ALL" >> /mnt/etc/sudoers if [[ "$EFI" == "yes" ]]; then - root="$(findmnt -n -o SOURCE /mnt | awk 'BEGIN { FS = "/" }; { print $3 }' | sed "s/\[//")" - arch-chroot /mnt refind-install - echo '"Crystal Linux" "rw root=/dev/placeholder rootflags=subvol=@"' > /mnt/boot/refind_linux.conf - sed -i "s/placeholder/$root/" /mnt/boot/refind_linux.conf + arch-chroot /mnt grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=crystal --removable else - arch-chroot /mnt curl https://git.getcryst.al/crystal/Syslinux_install_script/raw/branch/master/syslinux-install_update -o /usr/bin/syslinux-install_update - arch-chroot /mnt syslinux-install_update -i -a -m + arch-chroot /mnt grub-install --target=i386-pc ${DISK}1 fi +arch-chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg + arch-chroot /mnt systemctl enable NetworkManager arch-chroot pacman-key --init