Use amd64 EFI GRUB explicitly

This commit is contained in:
Joshua Boniface 2019-06-15 14:59:19 -04:00
parent 99de32211a
commit 751f02df83
2 changed files with 3 additions and 3 deletions

View File

@ -95,13 +95,13 @@ prepare_iso() {
prepare_rootfs() { prepare_rootfs() {
echo -n "Preparing Debian live installation via debootstrap... " echo -n "Preparing Debian live installation via debootstrap... "
SQUASHFS_PKGLIST="mdadm,lvm2,parted,gdisk,debootstrap,grub-pc,grub-efi,linux-image-amd64,sipcalc,live-boot,dosfstools" SQUASHFS_PKGLIST="mdadm,lvm2,parted,gdisk,debootstrap,grub-pc,grub-efi-amd64,linux-image-amd64,sipcalc,live-boot,dosfstools"
if [[ ! -d artifacts/debootstrap ]]; then if [[ ! -d artifacts/debootstrap ]]; then
sudo /usr/sbin/debootstrap \ sudo /usr/sbin/debootstrap \
--include=${SQUASHFS_PKGLIST} \ --include=${SQUASHFS_PKGLIST} \
buster \ buster \
artifacts/debootstrap/ \ artifacts/debootstrap/ \
http://localhost:3142/ftp.ca.debian.org/debian &>/dev/null || fail "Error performing debootstrap." http://localhost:3142/ftp.ca.debian.org/debian &>debootstrap.log || fail "Error performing debootstrap."
sudo chroot artifacts/debootstrap/ apt clean &>/dev/null || fail "Error cleaning apt cache in debootstrap." sudo chroot artifacts/debootstrap/ apt clean &>/dev/null || fail "Error cleaning apt cache in debootstrap."
fi fi
sudo rsync -au artifacts/debootstrap/ ${tempdir}/rootfs/ &>/dev/null || fail "Error copying debootstrap to tempdir." sudo rsync -au artifacts/debootstrap/ ${tempdir}/rootfs/ &>/dev/null || fail "Error copying debootstrap to tempdir."

View File

@ -8,7 +8,7 @@ fi
logfile="/tmp/pvc-install.log" logfile="/tmp/pvc-install.log"
debrelease="buster" debrelease="buster"
debmirror="http://debian.mirror.rafal.ca/debian" debmirror="http://debian.mirror.rafal.ca/debian"
debpkglist="lvm2,parted,gdisk,grub-pc,grub-efi,linux-image-amd64,sudo,vim,gpg,gpg-agent,aptitude,openssh-server" debpkglist="lvm2,parted,gdisk,grub-pc,grub-efi-amd64,linux-image-amd64,sudo,vim,gpg,gpg-agent,aptitude,openssh-server"
clear clear