From a2b257ef9edce46d2edbdba76272b55c21d560a8 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 1 Sep 2023 15:41:53 -0400 Subject: [PATCH] Use amd64 EFI GRUB explicitly --- buildiso.sh | 4 ++-- install.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/buildiso.sh b/buildiso.sh index 9f7b839..c96db3c 100755 --- a/buildiso.sh +++ b/buildiso.sh @@ -95,13 +95,13 @@ prepare_iso() { prepare_rootfs() { 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 sudo /usr/sbin/debootstrap \ --include=${SQUASHFS_PKGLIST} \ buster \ 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." fi sudo rsync -au artifacts/debootstrap/ ${tempdir}/rootfs/ &>/dev/null || fail "Error copying debootstrap to tempdir." diff --git a/install.sh b/install.sh index 82bf25d..0163f4f 100755 --- a/install.sh +++ b/install.sh @@ -8,7 +8,7 @@ fi logfile="/tmp/pvc-install.log" debrelease="buster" 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