Merge pull request #3755 from ggiguash/use_reqpart

USHIFT-3789: Start using reqpart for partitioning disks in kickstart

docs/config/microshift-starter.ks

@@ -7,14 +7,14 @@ reboot
 # Configure network to use DHCP and activate on boot
 network --bootproto=dhcp --device=link --activate --onboot=on
 
-# Partition disk with a 1MB BIOS boot, 200M EFI, 800M boot XFS partition and
-# an LVM volume containing a 10GB+ system root. The remainder of the volume
-# will be used by the CSI driver for storing data
+# Partition the disk with hardware-specific boot and swap partitions, adding an
+# LVM volume that contains a 10GB+ system root. The remainder of the volume will
+# be used by the CSI driver for storing data.
 zerombr
-clearpart --all --disklabel gpt
-part biosboot --fstype=biosboot --size=1
-part /boot/efi --fstype=efi --size=200
-part /boot --fstype=xfs --asprimary --size=800
+clearpart --all --initlabel
+# Create boot and swap partitions as required by the current hardware platform
+reqpart --add-boot
+# Add an LVM volume group and allocate a system root logical volume
 part pv.01 --grow
 volgroup rhel pv.01
 logvol / --vgname=rhel --fstype=xfs --size=10240 --name=root

docs/contributor/image_mode.md

@@ -287,13 +287,14 @@ timezone UTC
 text
 reboot
 
-# Partition disk with a 1GB boot XFS partition and an LVM volume containing a 10GB+
-# system root. The remainder of the volume is for the CSI driver for storing data.
+# Partition the disk with hardware-specific boot and swap partitions, adding an
+# LVM volume that contains a 10GB+ system root. The remainder of the volume will
+# be used by the CSI driver for storing data.
 zerombr
 clearpart --all --initlabel
-part biosboot --fstype=biosboot --size=1 --asprimary
-part /boot/efi --fstype=efi --size=200
-part /boot --fstype=xfs --asprimary --size=800
+# Create boot and swap partitions as required by the current hardware platform
+reqpart --add-boot
+# Add an LVM volume group and allocate a system root logical volume
 part pv.01 --grow
 volgroup rhel pv.01
 logvol / --vgname=rhel --fstype=xfs --size=10240 --name=root

scripts/image-builder/config/kickstart.ks.template

@@ -7,27 +7,26 @@ reboot
 # Configure network to use DHCP and activate on boot
 network --bootproto=dhcp --device=link --activate --onboot=on
 
-# Partition disk with a 1MB BIOS boot, 200M EFI, 800M boot XFS partition and
-# an LVM volume containing a 10GB+ system root. The remainder of the volume
-# will be used by the CSI driver for storing data
+# Partition the disk with hardware-specific boot and swap partitions, adding an
+# LVM volume that contains a 10GB+ system root. The remainder of the volume will
+# be used by the CSI driver for storing data.
 #
-# For example, a 20GB disk would be partitioned in the following way:
+# For example, a 20GB disk may be partitioned in the following way:
 #
-# NAME          MAJ:MIN RM SIZE RO TYPE MOUNTPOINT
-# sda             8:0    0  20G  0 disk
-# ├─sda1          8:1    0   1M  0 part
-# ├─sda2          8:2    0 200M  0 part /boot/efi
-# ├─sda3          8:3    0 800M  0 part /boot
-# └─sda4          8:4    0  19G  0 part
-#  └─rhel-root  253:0    0  10G  0 lvm  /sysroot
+# NAME          MAJ:MIN RM  SIZE RO TYPE MOUNTPOINTS
+# loop0           7:0    0  7.9M  1 loop
+# sda             8:0    0   20G  0 disk
+# ├─sda1          8:1    0    1G  0 part /boot
+# └─sda2          8:2    0   19G  0 part
+#   └─rhel-root 253:0    0   10G  0 lvm  /sysroot
+# sr0            11:0    1 1024M  0 rom
+# zram0         252:0    0  3.6G  0 disk [SWAP]
 #
 zerombr
-clearpart --all --disklabel gpt
-part biosboot --fstype=biosboot --size=1
-part /boot/efi --fstype=efi --size=200
-part /boot --fstype=xfs --asprimary --size=800
-# Uncomment this line to add a SWAP partition of the recommended size
-#part swap --fstype=swap --recommended
+clearpart --all --initlabel
+# Create boot and swap partitions as required by the current hardware platform
+reqpart --add-boot
+# Add an LVM volume group and allocate a system root logical volume
 part pv.01 --grow
 volgroup rhel pv.01
 logvol / --vgname=rhel --fstype=xfs --size=REPLACE_LVM_SYSROOT_SIZE --name=root

test/kickstart-templates/includes/main-prologue.cfg

@@ -4,25 +4,26 @@ timezone UTC
 text
 reboot
 
-# Partition disk with a 1GB boot XFS partition and an LVM volume containing a 10GB+ system root
-# The remainder of the volume will be used by the CSI driver for storing data
+# Partition the disk with hardware-specific boot and swap partitions, adding an
+# LVM volume that contains a 10GB+ system root. The remainder of the volume will
+# be used by the CSI driver for storing data.
 #
-# For example, a 20GB disk would be partitioned in the following way:
+# For example, a 20GB disk may be partitioned in the following way:
 #
-# NAME          MAJ:MIN RM SIZE RO TYPE MOUNTPOINT
-# sda             8:0    0  20G  0 disk
-# ├─sda1          8:1    0 200M  0 part /boot/efi
-# ├─sda1          8:1    0 800M  0 part /boot
-# └─sda2          8:2    0  19G  0 part
-#  └─rhel-root  253:0    0  10G  0 lvm  /sysroot
+# NAME          MAJ:MIN RM  SIZE RO TYPE MOUNTPOINTS
+# loop0           7:0    0  7.9M  1 loop
+# sda             8:0    0   20G  0 disk
+# ├─sda1          8:1    0    1G  0 part /boot
+# └─sda2          8:2    0   19G  0 part
+#   └─rhel-root 253:0    0   10G  0 lvm  /sysroot
+# sr0            11:0    1 1024M  0 rom
+# zram0         252:0    0  3.6G  0 disk [SWAP]
 #
 zerombr
 clearpart --all --initlabel
-part biosboot --fstype=biosboot --size=1 --asprimary
-part /boot/efi --fstype=efi --size=200
-part /boot --fstype=xfs --asprimary --size=800
-# Uncomment this line to add a SWAP partition of the recommended size
-#part swap --fstype=swap --recommended
+# Create boot and swap partitions as required by the current hardware platform
+reqpart --add-boot
+# Add an LVM volume group and allocate a system root logical volume
 part pv.01 --grow
 volgroup rhel pv.01
 logvol / --vgname=rhel --fstype=xfs --size=REPLACE_LVM_SYSROOT_SIZE --name=root