artix

commit 001808750666dc3acfb72b47059d085c64cb2f2d
parent 346730ca96a19e8d8026ff240f048b33940ce28f
Author: awy <awy@awy.one>
Date:   Thu, 10 Apr 2025 17:22:34 +0300

two passphrases fix

Diffstat:
M
install.sh
 | 
13
++++---------
M
post_chroot.sh
 | 
2
+-

2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/install.sh b/install.sh
@@ -24,8 +24,7 @@ diskpart()
 
 binkernel()
 {
-  mkdir /mnt/boot/efi
-  mount /dev/"$bootdrive" /mnt/boot/efi
+  mount /dev/"$bootdrive" /mnt/boot
   pacman -Sy --confirm
   case $kerneltype in
     1) basestrap /mnt base dinit elogind-dinit linux linux-headers ;;
@@ -141,11 +140,7 @@ esac
 UUID_ROOT=$(blkid -s UUID -o value /dev/"$rootdrive")
 UUID_BOOT=$(blkid -s UUID -o value /dev/"$bootdrive")
 
-if [ "$kerneltype" = 3 ]; then
-  echo "UUID=$UUID_BOOT /boot vfat defaults,noatime 0 2" > /mnt/etc/fstab
-else
-  echo "UUID=$UUID_BOOT /boot/efi vfat defaults,noatime 0 2" > /mnt/etc/fstab
-fi
+echo "UUID=$UUID_BOOT /boot vfat defaults,noatime 0 2" > /mnt/etc/fstab
 
 if [ "$encryption" = 1 ]; then
   echo "UUID=$UUID_ROOT / btrfs defaults,noatime,compress=zstd 0 1" >> /mnt/etc/fstab
@@ -169,8 +164,8 @@ cp post_chroot.sh /mnt
 artix-chroot /mnt ./post_chroot.sh
 
 if [ "$kerneltype" != 3 ]; then
-  mv /mnt/boot/efi/EFI/grub /mnt/boot/efi/EFI/BOOT
-  mv /mnt/boot/efi/EFI/BOOT/grubx64.efi /mnt/boot/efi/EFI/BOOT/BOOTX64.EFI
+  mv /mnt/boot/EFI/grub /mnt/boot/EFI/BOOT
+  mv /mnt/boot/EFI/BOOT/grubx64.efi /mnt/boot/EFI/BOOT/BOOTX64.EFI
 fi
 
 umount -R /mnt
diff --git a/post_chroot.sh b/post_chroot.sh
@@ -43,7 +43,7 @@ binkernel()
     *) printf "Invalid kernel" && exit 1 ;;
   esac
   sed "s#GRUB_TIMEOUT=.*#GRUB_TIMEOUT=1#g" /etc/default/grub
-  grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=grub
+  grub-install --target=x86_64-efi --efi-directory=/boot --bootloader-id=grub
 }
 
 customkernel()