From 883bc07fc84047c3c78d6c02a0d4010bd8435518 Mon Sep 17 00:00:00 2001 From: "Brian C. Lane" Date: Wed, 13 Feb 2019 17:03:51 -0800 Subject: [PATCH] lorax-composer: Use reqpart --add-boot for partitioned disk templates Some platforms, like ppc64, require that the /boot partition be present. It doesn't hurt to have it there on other platforms so instead of trying to add per-arch kickstart templates just use reqpart --add-boot everywhere. (cherry picked from commit a0ff34dcb1a93fdebffa3cbb6dc688ea42585586) --- share/composer/ami.ks | 5 +---- share/composer/openstack.ks | 2 +- share/composer/partitioned-disk.ks | 2 +- share/composer/qcow2.ks | 2 +- share/composer/vhd.ks | 5 +---- share/composer/vmdk.ks | 2 +- 6 files changed, 6 insertions(+), 12 deletions(-) diff --git a/share/composer/ami.ks b/share/composer/ami.ks index 023e3389..d0926afb 100644 --- a/share/composer/ami.ks +++ b/share/composer/ami.ks @@ -1,8 +1,5 @@ # Lorax Composer AMI output kickstart template -# Add a separate /boot partition -part /boot --size=1024 - # Firewall configuration firewall --enabled @@ -24,7 +21,7 @@ timezone US/Eastern # System bootloader configuration bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 console=tty1 net.ifnames=0" # Add platform specific partitions -reqpart +reqpart --add-boot # Basic services services --enabled=sshd,chronyd,cloud-init diff --git a/share/composer/openstack.ks b/share/composer/openstack.ks index 4872e2b2..2068e936 100644 --- a/share/composer/openstack.ks +++ b/share/composer/openstack.ks @@ -21,7 +21,7 @@ timezone US/Eastern # System bootloader configuration bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 console=tty1 net.ifnames=0" # Add platform specific partitions -reqpart +reqpart --add-boot # Start sshd and cloud-init at boot time services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final diff --git a/share/composer/partitioned-disk.ks b/share/composer/partitioned-disk.ks index 04d16488..a032c484 100644 --- a/share/composer/partitioned-disk.ks +++ b/share/composer/partitioned-disk.ks @@ -21,7 +21,7 @@ timezone US/Eastern # System bootloader configuration bootloader --location=mbr # Add platform specific partitions -reqpart +reqpart --add-boot %post # Remove random-seed diff --git a/share/composer/qcow2.ks b/share/composer/qcow2.ks index cea868c8..d8187dd6 100644 --- a/share/composer/qcow2.ks +++ b/share/composer/qcow2.ks @@ -21,7 +21,7 @@ timezone US/Eastern # System bootloader configuration bootloader --location=mbr # Add platform specific partitions -reqpart +reqpart --add-boot %post # Remove random-seed diff --git a/share/composer/vhd.ks b/share/composer/vhd.ks index 414adf38..da82ae11 100644 --- a/share/composer/vhd.ks +++ b/share/composer/vhd.ks @@ -1,8 +1,5 @@ # Lorax Composer VHD (Azure, Hyper-V) output kickstart template -# Add a separate /boot partition -part /boot --size=1024 - # Firewall configuration firewall --enabled @@ -24,7 +21,7 @@ timezone US/Eastern # System bootloader configuration bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 earlyprintk=ttyS0,115200 rootdelay=300 net.ifnames=0" # Add platform specific partitions -reqpart +reqpart --add-boot # Basic services services --enabled=sshd,chronyd,waagent diff --git a/share/composer/vmdk.ks b/share/composer/vmdk.ks index ab8e3559..e0a57f91 100644 --- a/share/composer/vmdk.ks +++ b/share/composer/vmdk.ks @@ -21,7 +21,7 @@ timezone US/Eastern # System bootloader configuration bootloader --location=mbr # Add platform specific partitions -reqpart +reqpart --add-boot # Basic services services --enabled=sshd,chronyd,vmtoolsd