From deeac2a61bc43cb4596579d8e21f0a2423e0f153 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 22 Mar 2023 14:04:36 -0700 Subject: [PATCH] add %pre to base images --- Rocky-8-Azure-Base.ks | 25 ++++++++++++++++++++++--- Rocky-8-EC2-Base.ks | 25 ++++++++++++++++++++++--- Rocky-8-GenericCloud-Base.ks | 21 ++++++++++++++++++++- cloud/rocky-cloud-parts-base.ks | 27 ++++++++++++++++++++++++--- 4 files changed, 88 insertions(+), 10 deletions(-) diff --git a/Rocky-8-Azure-Base.ks b/Rocky-8-Azure-Base.ks index 183b7d2..28f9980 100644 --- a/Rocky-8-Azure-Base.ks +++ b/Rocky-8-Azure-Base.ks @@ -28,15 +28,34 @@ services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud # System bootloader configuration bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 # Clear the Master Boot Record -zerombr +#zerombr # Partition clearing information -clearpart --all --initlabel --disklabel=gpt +#clearpart --all --initlabel --disklabel=gpt # Disk partitioning information -part biosboot --fstype="biosboot" --size=1 part /boot/efi --fstype="efi" --size=100 part /boot --fstype="xfs" --size=1000 --label=boot +part prepboot --fstype=biosboot --asprimary --onpart=vda3 +part biosboot --fstype="biosboot" --size=1 part / --fstype="xfs" --grow --size=8000 --mkfsoptions="-m bigtime=0,inobtcount=0" +%pre +# Clear the Master Boot Record +dd if=/dev/zero of=/dev/vda bs=512 count=1 +# Create a new GPT partition table +parted /dev/vda mklabel gpt +# Create a partition for /boot/efi +parted /dev/vda mkpart primary fat32 1MiB 100MiB +parted /dev/vda set 1 boot on +# Create a partition for /boot +parted /dev/vda mkpart primary xfs 100MiB 1100MiB +# Create a partition for prep +parted /dev/vda mkpart primary 1100MiB 1104MiB +# Create a partition for bios_grub +parted /dev/vda mkpart primary 1104MiB 1105MiB +# Create a partition for LVM +parted /dev/vda mkpart primary xfs 1106MiB 10.7GB +%end + %post --erroronfail passwd -d root passwd -l root diff --git a/Rocky-8-EC2-Base.ks b/Rocky-8-EC2-Base.ks index 177d6e4..6c37edc 100644 --- a/Rocky-8-EC2-Base.ks +++ b/Rocky-8-EC2-Base.ks @@ -16,16 +16,35 @@ services --disabled="kdump" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud timezone UTC --isUtc # Disk bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0 nvme_core.io_timeout=4294967295 nvme_core.max_retries=10" --location=mbr --timeout=1 -zerombr -clearpart --all --initlabel --disklabel=gpt +#zerombr +#clearpart --all --initlabel --disklabel=gpt #reqpart -part biosboot --size=1 --fstype=biosboot --asprimary part /boot/efi --size=100 --fstype=efi --asprimary part /boot --size=1024 --fstype=xfs --label=boot +part prepboot --fstype=biosboot --asprimary --onpart=vda3 +part biosboot --size=1 --fstype=biosboot --asprimary part / --size=8000 --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0" url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +%pre +# Clear the Master Boot Record +dd if=/dev/zero of=/dev/vda bs=512 count=1 +# Create a new GPT partition table +parted /dev/vda mklabel gpt +# Create a partition for /boot/efi +parted /dev/vda mkpart primary fat32 1MiB 100MiB +parted /dev/vda set 1 boot on +# Create a partition for /boot +parted /dev/vda mkpart primary xfs 100MiB 1100MiB +# Create a partition for prep +parted /dev/vda mkpart primary 1100MiB 1104MiB +# Create a partition for bios_grub +parted /dev/vda mkpart primary 1104MiB 1105MiB +# Create a partition for LVM +parted /dev/vda mkpart primary xfs 1106MiB 10.7GB +%end + %post --erroronfail passwd -d root passwd -l root diff --git a/Rocky-8-GenericCloud-Base.ks b/Rocky-8-GenericCloud-Base.ks index 123344d..ac15983 100644 --- a/Rocky-8-GenericCloud-Base.ks +++ b/Rocky-8-GenericCloud-Base.ks @@ -19,14 +19,33 @@ rootpw --iscrypted thereisnopasswordanditslocked zerombr clearpart --all --initlabel --disklabel=gpt #reqpart -part biosboot --size=1 --fstype=biosboot --asprimary part /boot/efi --size=100 --fstype=efi --asprimary part /boot --size=1000 --fstype=xfs --label=boot +part prepboot --fstype=biosboot --asprimary --onpart=vda3 +part biosboot --size=1 --fstype=biosboot --asprimary part / --size=8000 --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0" --grow shutdown url --url https://download.rockylinux.org/stg/rocky/8/BaseOS/$basearch/os/ +%pre +# Clear the Master Boot Record +dd if=/dev/zero of=/dev/vda bs=512 count=1 +# Create a new GPT partition table +parted /dev/vda mklabel gpt +# Create a partition for /boot/efi +parted /dev/vda mkpart primary fat32 1MiB 100MiB +parted /dev/vda set 1 boot on +# Create a partition for /boot +parted /dev/vda mkpart primary xfs 100MiB 1100MiB +# Create a partition for prep +parted /dev/vda mkpart primary 1100MiB 1104MiB +# Create a partition for bios_grub +parted /dev/vda mkpart primary 1104MiB 1105MiB +# Create a partition for LVM +parted /dev/vda mkpart primary xfs 1106MiB 10.7GB +%end + %packages @core chrony diff --git a/cloud/rocky-cloud-parts-base.ks b/cloud/rocky-cloud-parts-base.ks index ec6bf6f..b3cfeb9 100644 --- a/cloud/rocky-cloud-parts-base.ks +++ b/cloud/rocky-cloud-parts-base.ks @@ -1,6 +1,27 @@ -zerombr -clearpart --all --initlabel --disklabel=gpt -part biosboot --size=1 --fstype=biosboot --asprimary +#zerombr +#clearpart --all --initlabel --disklabel=gpt part /boot/efi --size=100 --fstype=efi --asprimary part /boot --size=1000 --fstype=xfs --label=boot +part prepboot --fstype=biosboot --asprimary --onpart=vda3 +part biosboot --size=1 --fstype=biosboot --asprimary part / --size=8000 --fstype="xfs" --mkfsoptions "-m bigtime=0,inobtcount=0" --grow + +%pre +# Clear the Master Boot Record +dd if=/dev/zero of=/dev/vda bs=512 count=1 +# Create a new GPT partition table +parted /dev/vda mklabel gpt +# Create a partition for /boot/efi +parted /dev/vda mkpart primary fat32 1MiB 100MiB +parted /dev/vda set 1 boot on +# Create a partition for /boot +parted /dev/vda mkpart primary xfs 100MiB 1100MiB +# Create a partition for prep +parted /dev/vda mkpart primary 1100MiB 1104MiB +# Create a partition for bios_grub +parted /dev/vda mkpart primary 1104MiB 1105MiB +# Create a partition for LVM +parted /dev/vda mkpart primary xfs 1106MiB 10.7GB +%end + +