diff --git a/installer.sh b/installer.sh index 2ceb718..e9c4695 100755 --- a/installer.sh +++ b/installer.sh @@ -168,8 +168,10 @@ installtype=$(cat /tmp/installtype) if [ $uefi = true ]; then if [ $(uname -m) = "i686" ]; then _grub="grub-i386-efi" + arch=i386 else _grub="grub-x86_64-efi" + grub=x86_64 fi else _grub="grub" @@ -189,6 +191,9 @@ fi xbps-reconfigure -r /mnt -f base-system chroot /mnt xbps-reconfigure -fa | dialog --title "Reconfiguring packages..." --programbox 24 80 +chroot /mnt grub-install --target=$arch --efi-directory=/hoot/efi --bootloader-id=void_grub --recheck +chroot /mnt grub-mkconfig -o /boot/grub/grub.cfg + while true; do dialog --title "Password" --clear --insecure --passwordbox "Enter Admin (root) password. For security reasons, you cannot log in as admin. Press enter to submit." 0 0 2>/tmp/rootpasswd rootpasswd="$(cat /tmp/rootpasswd)" diff --git a/test.sh b/test.sh deleted file mode 100755 index 3767560..0000000 --- a/test.sh +++ /dev/null @@ -1,3 +0,0 @@ -bash - -echo Hello