diff --git a/install-stage1.sh b/install-stage1.sh index ea0ae63..bdbf1d2 100644 --- a/install-stage1.sh +++ b/install-stage1.sh @@ -44,14 +44,16 @@ This script will now download and install Void Linux on your USB stick. Any data that is currently on the stick will be lost and it won’t be usable from Windows or MacOS. -Before we begin, the following tools need to be installed: +Before we begin, the following packages need to be installed (if not installed already): - xmirror -- squashfs-tools" +- squashfs-tools +- wget +- xtools-minimal" press_any_key xbps-install --sync xbps-install --yes --update xbps -xbps-install --yes xmirror squashfs-tools +xbps-install --yes xmirror squashfs-tools wget xtools-minimal #TODO: If going down the path of extracting routines from void-installer and # xmirror, that should be done here. @@ -276,9 +278,12 @@ run_in_target grub-install --target=i386-pc --boot-directory=/boot/efi/LOADER -- run_in_target grub-install --target=i386-efi --boot-directory=/boot/efi/LOADER --efi-directory=/boot/efi --removable --no-nvram --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'" run_in_target grub-install --target=x86_64-efi --boot-directory=/boot/efi/LOADER --efi-directory=/boot/efi --removable --no-nvram --modules="'$TARGET_PRELOAD_GRUB_MODULES'" "'/dev/$TARGET_DISK'" +mkdir -p /mnt/target/opt/void-usb +chmod 755 /mnt/target/opt/void-usb +wget --output-document=/mnt/target/opt/void-usb/grub-config https://lostcave.ddnss.de/git/BodgeMaster/void-minecraft-usb/raw/branch/master/opt/grub-config +chmod 744 /mnt/target/opt/void-usb/grub-config - - +run_in_target /opt/void-usb/grub-config #