Make the lorax-composer ks templates more generic

Some platforms do not have grub2, and some require other partitions.

Anaconda will add platform specific partitions if the 'reqpart' command
is included, and it will add bootloader specific packages to the list if
they are needed.

Related: rhbz#1673744
This commit is contained in:
Brian C. Lane 2019-02-12 16:57:21 -08:00
parent 2f8fb6fa8e
commit 3c2f06899c
6 changed files with 12 additions and 6 deletions

View File

@ -23,6 +23,8 @@ shutdown
timezone US/Eastern timezone US/Eastern
# System bootloader configuration # System bootloader configuration
bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 console=tty1 net.ifnames=0" bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 console=tty1 net.ifnames=0"
# Add platform specific partitions
reqpart
# Basic services # Basic services
services --enabled=sshd,chronyd,cloud-init services --enabled=sshd,chronyd,cloud-init
@ -43,7 +45,6 @@ sed -i 's/cloud-user/ec2-user/' /etc/cloud/cloud.cfg
kernel kernel
-dracut-config-rescue -dracut-config-rescue
selinux-policy-targeted selinux-policy-targeted
grub2
chrony chrony

View File

@ -20,6 +20,8 @@ shutdown
timezone US/Eastern timezone US/Eastern
# System bootloader configuration # System bootloader configuration
bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 console=tty1 net.ifnames=0" bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 console=tty1 net.ifnames=0"
# Add platform specific partitions
reqpart
# Start sshd and cloud-init at boot time # Start sshd and cloud-init at boot time
services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final services --enabled=sshd,cloud-init,cloud-init-local,cloud-config,cloud-final
@ -37,7 +39,6 @@ touch /etc/machine-id
kernel kernel
-dracut-config-rescue -dracut-config-rescue
selinux-policy-targeted selinux-policy-targeted
grub2
# Make sure virt guest agents are installed # Make sure virt guest agents are installed
qemu-guest-agent qemu-guest-agent

View File

@ -20,6 +20,8 @@ shutdown
timezone US/Eastern timezone US/Eastern
# System bootloader configuration # System bootloader configuration
bootloader --location=mbr bootloader --location=mbr
# Add platform specific partitions
reqpart
%post %post
# Remove random-seed # Remove random-seed
@ -34,6 +36,5 @@ touch /etc/machine-id
kernel kernel
-dracut-config-rescue -dracut-config-rescue
selinux-policy-targeted selinux-policy-targeted
grub2
# NOTE lorax-composer will add the blueprint packages below here, including the final %end # NOTE lorax-composer will add the blueprint packages below here, including the final %end

View File

@ -20,6 +20,8 @@ shutdown
timezone US/Eastern timezone US/Eastern
# System bootloader configuration # System bootloader configuration
bootloader --location=mbr bootloader --location=mbr
# Add platform specific partitions
reqpart
%post %post
# Remove random-seed # Remove random-seed
@ -34,7 +36,6 @@ touch /etc/machine-id
kernel kernel
-dracut-config-rescue -dracut-config-rescue
selinux-policy-targeted selinux-policy-targeted
grub2
# Make sure virt guest agents are installed # Make sure virt guest agents are installed
qemu-guest-agent qemu-guest-agent

View File

@ -23,6 +23,8 @@ shutdown
timezone US/Eastern timezone US/Eastern
# System bootloader configuration # System bootloader configuration
bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 earlyprintk=ttyS0,115200 rootdelay=300 net.ifnames=0" bootloader --location=mbr --append="no_timer_check console=ttyS0,115200n8 earlyprintk=ttyS0,115200 rootdelay=300 net.ifnames=0"
# Add platform specific partitions
reqpart
# Basic services # Basic services
services --enabled=sshd,chronyd,waagent services --enabled=sshd,chronyd,waagent
@ -62,7 +64,6 @@ dracut -f -v --persistent-policy by-uuid
kernel kernel
-dracut-config-rescue -dracut-config-rescue
selinux-policy-targeted selinux-policy-targeted
grub2
chrony chrony

View File

@ -20,6 +20,8 @@ shutdown
timezone US/Eastern timezone US/Eastern
# System bootloader configuration # System bootloader configuration
bootloader --location=mbr bootloader --location=mbr
# Add platform specific partitions
reqpart
# Basic services # Basic services
services --enabled=sshd,chronyd,vmtoolsd services --enabled=sshd,chronyd,vmtoolsd
@ -37,7 +39,6 @@ touch /etc/machine-id
kernel kernel
-dracut-config-rescue -dracut-config-rescue
selinux-policy-targeted selinux-policy-targeted
grub2
chrony chrony
open-vm-tools open-vm-tools