From afe002cb5b507009e7560a460f396654211b28ec Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Mon, 21 Nov 2022 23:52:14 -0700
Subject: [PATCH] Attempt to resolve EC2 issues with 9.1

---
 Rocky-9-EC2-Base.ks | 20 +++++++++++---------
 Rocky-9-EC2-LVM.ks  | 20 +++++++++++---------
 2 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/Rocky-9-EC2-Base.ks b/Rocky-9-EC2-Base.ks
index 87f9105..426130b 100644
--- a/Rocky-9-EC2-Base.ks
+++ b/Rocky-9-EC2-Base.ks
@@ -16,17 +16,13 @@ rootpw --iscrypted thereisnopasswordanditslocked
 
 # Partition Stuff
 zerombr
-clearpart --all --initlabel 
-part /boot --fstype xfs --size 1024 --asprimary --ondisk vda
-part /boot/efi --fstype vfat --size 512 --asprimary --ondisk vda
-reqpart
-part / --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0" --ondisk=vda --size=8000
+clearpart --all --initlabel --disklabel=gpt
+#reqpart
+part /boot/efi --size=100  --fstype=efi   --asprimary
+part /boot     --size=1024 --fstype=xfs   --asprimary --label=boot
+part /         --size=8000 --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0"
 shutdown
 
-%pre --erroronfail
-/usr/sbin/parted -s /dev/vda mklabel gpt
-%end
-
 %packages
 @core
 rocky-release
@@ -82,6 +78,12 @@ rng-tools
 passwd -d root
 passwd -l root
 
+# Attempting to force legacy BIOS boot if we boot from UEFI
+if [ "$(arch)" = "x86_64" ]; then
+  dnf install grub2-pc-modules grub2-pc -y
+  grub2-install --target=i386-pc /dev/vda
+fi
+
 # setup systemd to boot to the right runlevel
 rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target
diff --git a/Rocky-9-EC2-LVM.ks b/Rocky-9-EC2-LVM.ks
index dd9133b..96645f6 100644
--- a/Rocky-9-EC2-LVM.ks
+++ b/Rocky-9-EC2-LVM.ks
@@ -16,19 +16,15 @@ rootpw --iscrypted thereisnopasswordanditslocked
 
 # Partition stuff - Should work for x86 and aarch64
 zerombr
-clearpart --all --initlabel 
-part /boot --fstype xfs --size 1024 --asprimary --ondisk vda
-part /boot/efi --fstype vfat --size 512 --asprimary --ondisk vda
-reqpart
-part pv.01     --size=1    --ondisk=vda      --asprimary --grow
+clearpart --all --initlabel --disklabel=gpt
+#reqpart
+part /boot/efi --size=100  --fstype=efi   --asprimary
+part /boot     --size=1024 --fstype=xfs   --asprimary --label=boot
+part pv.01     --size=1    --ondisk=vda   --asprimary --grow
 volgroup rocky pv.01
 logvol / --vgname=rocky --size=8000 --name=root --grow --mkfsoptions "-m bigtime=0,inobtcount=0"
 shutdown
 
-%pre --erroronfail
-/usr/sbin/parted -s /dev/vda mklabel gpt
-%end
-
 %packages
 @core
 rocky-release
@@ -84,6 +80,12 @@ rng-tools
 passwd -d root
 passwd -l root
 
+# Attempting to force legacy BIOS boot if we boot from UEFI
+if [ "$(arch)" = "x86_64" ]; then
+  dnf install grub2-pc-modules grub2-pc -y
+  grub2-install --target=i386-pc /dev/vda
+fi
+
 # setup systemd to boot to the right runlevel
 rm -f /etc/systemd/system/default.target
 ln -s /lib/systemd/system/multi-user.target /etc/systemd/system/default.target