From 64fd356deae974effc8d737654d9434c72849704 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 21 Aug 2024 20:10:24 -0700 Subject: [PATCH] Backport sig_core/rocky-kiwi-descriptions#3 and mod readme --- Rocky-9-Azure-Base.ks | 2 +- Rocky-9-Azure-LVM.ks | 2 +- Rocky-9-GenericCloud-Base.ks | 2 +- Rocky-9-GenericCloud-LVM.ks | 2 +- Rocky-9-OCP-Base.ks | 2 +- cloud/rocky-azure-base.ks | 2 +- cloud/rocky-azure-lvm.ks | 2 +- cloud/rocky-genclo-base.ks | 2 +- cloud/rocky-genclo-lvm.ks | 2 +- cloud/rocky-ocp-base.ks | 2 +- cloud/rocky-ocp.ks | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Rocky-9-Azure-Base.ks b/Rocky-9-Azure-Base.ks index c2088b6..d6931f1 100644 --- a/Rocky-9-Azure-Base.ks +++ b/Rocky-9-Azure-Base.ks @@ -26,7 +26,7 @@ selinux --enforcing # System services services --disabled="kdump,rhsmcertd" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd" # System bootloader configuration -bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 +bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0" --location=mbr --timeout=1 # Disk partitioning information # NOTE(neil): 2023-05-12 NONE of reqpart, clearpart, zerombr can be used. We diff --git a/Rocky-9-Azure-LVM.ks b/Rocky-9-Azure-LVM.ks index 6f2eb45..379c075 100644 --- a/Rocky-9-Azure-LVM.ks +++ b/Rocky-9-Azure-LVM.ks @@ -26,7 +26,7 @@ selinux --enforcing # System services services --disabled="kdump,rhsmcertd" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd" # System bootloader configuration -bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 +bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0" --location=mbr --timeout=1 # Clear the Master Boot Record #zerombr # Partition clearing information diff --git a/Rocky-9-GenericCloud-Base.ks b/Rocky-9-GenericCloud-Base.ks index 06e6c51..0ef409c 100644 --- a/Rocky-9-GenericCloud-Base.ks +++ b/Rocky-9-GenericCloud-Base.ks @@ -3,7 +3,7 @@ lang en_US.UTF-8 keyboard us timezone --utc UTC # Disk -bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 +bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0" --location=mbr --timeout=1 auth --enableshadow --passalgo=sha512 selinux --enforcing firewall --enabled --service=ssh diff --git a/Rocky-9-GenericCloud-LVM.ks b/Rocky-9-GenericCloud-LVM.ks index 25095f3..6b39644 100644 --- a/Rocky-9-GenericCloud-LVM.ks +++ b/Rocky-9-GenericCloud-LVM.ks @@ -3,7 +3,7 @@ lang en_US.UTF-8 keyboard us timezone --utc UTC # Disk -bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 +bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0" --location=mbr --timeout=1 auth --enableshadow --passalgo=sha512 selinux --enforcing firewall --enabled --service=ssh diff --git a/Rocky-9-OCP-Base.ks b/Rocky-9-OCP-Base.ks index 6b2d9cf..422184e 100644 --- a/Rocky-9-OCP-Base.ks +++ b/Rocky-9-OCP-Base.ks @@ -31,7 +31,7 @@ selinux --enforcing # System services services --disabled="kdump,rhsmcertd" --enabled="NetworkManager,sshd,rsyslog,chronyd,cloud-init,cloud-init-local,cloud-config,cloud-final,rngd" # System bootloader configuration -bootloader --append="console=ttyS0,115200n8 console=tty0 no_timer_check crashkernel=auto net.ifnames=0 LANG=en_US.UTF-8 transparent_hugepage=never rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=rocky rd.lvm.lv=rocky/root rd.net.timeout.dhcp=10 libiscsi.debug_libiscsi_eh=1 netroot=iscsi:169.254.0.2:::1:iqn.2015-02.oracle.boot:uefi ip=dhcp rd.iscsi.bypass rd.iscsi.param=node.session.timeo.replacement_timeout=6000" --location=mbr --timeout=1 --boot-drive=vda +bootloader --append="console=ttyS0,115200n8 console=tty0 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0 LANG=en_US.UTF-8 transparent_hugepage=never rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=rocky rd.lvm.lv=rocky/root rd.net.timeout.dhcp=10 libiscsi.debug_libiscsi_eh=1 netroot=iscsi:169.254.0.2:::1:iqn.2015-02.oracle.boot:uefi ip=dhcp rd.iscsi.bypass rd.iscsi.param=node.session.timeo.replacement_timeout=6000" --location=mbr --timeout=1 --boot-drive=vda # Disk partitioning information # NOTE(neil): 2023-05-12 NONE of reqpart, clearpart, zerombr can be used. We diff --git a/cloud/rocky-azure-base.ks b/cloud/rocky-azure-base.ks index 00d66c8..900219c 100644 --- a/cloud/rocky-azure-base.ks +++ b/cloud/rocky-azure-base.ks @@ -2,7 +2,7 @@ %include rocky-cloud-parts-base.ks %include rocky-cloud-azure-packages.ks -bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 +bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0" --location=mbr --timeout=1 %post --erroronfail passwd -d root diff --git a/cloud/rocky-azure-lvm.ks b/cloud/rocky-azure-lvm.ks index 2966d10..59e9254 100644 --- a/cloud/rocky-azure-lvm.ks +++ b/cloud/rocky-azure-lvm.ks @@ -2,7 +2,7 @@ %include rocky-cloud-parts-lvm.ks %include rocky-cloud-azure-packages.ks -bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 +bootloader --append="rootdelay=300 console=ttyS0 earlyprintk=ttyS0 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0" --location=mbr --timeout=1 %post --erroronfail passwd -d root diff --git a/cloud/rocky-genclo-base.ks b/cloud/rocky-genclo-base.ks index bc876f4..7d391b1 100644 --- a/cloud/rocky-genclo-base.ks +++ b/cloud/rocky-genclo-base.ks @@ -2,7 +2,7 @@ %include rocky-cloud-parts-base.ks %include rocky-cloud-base-packages.ks -bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 +bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0" --location=mbr --timeout=1 %post --erroronfail passwd -d root diff --git a/cloud/rocky-genclo-lvm.ks b/cloud/rocky-genclo-lvm.ks index 1a6b160..5aadbc4 100644 --- a/cloud/rocky-genclo-lvm.ks +++ b/cloud/rocky-genclo-lvm.ks @@ -2,7 +2,7 @@ %include rocky-cloud-parts-lvm.ks %include rocky-cloud-base-packages.ks -bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=auto net.ifnames=0" --location=mbr --timeout=1 +bootloader --append="console=ttyS0,115200n8 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0" --location=mbr --timeout=1 %post --erroronfail passwd -d root diff --git a/cloud/rocky-ocp-base.ks b/cloud/rocky-ocp-base.ks index 3b78dcf..0f9a0e2 100644 --- a/cloud/rocky-ocp-base.ks +++ b/cloud/rocky-ocp-base.ks @@ -6,7 +6,7 @@ repo --name "sig-cloud-common" --baseurl=http://dl.rockylinux.org/stg/sig/9/clou repo --name "extras" --baseurl=http://dl.rockylinux.org/stg/rocky/9/extras/$basearch/os/ repo --name=epel --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/$basearch/ -bootloader --append="console=ttyS0,115200n8 console=tty0 no_timer_check crashkernel=auto net.ifnames=0 LANG=en_US.UTF-8 transparent_hugepage=never rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=rocky rd.lvm.lv=rocky/root rd.net.timeout.dhcp=10" --location=mbr --timeout=1 --boot-drive=vda +bootloader --append="console=ttyS0,115200n8 console=tty0 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0 LANG=en_US.UTF-8 transparent_hugepage=never rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=rocky rd.lvm.lv=rocky/root rd.net.timeout.dhcp=10" --location=mbr --timeout=1 --boot-drive=vda %post --erroronfail diff --git a/cloud/rocky-ocp.ks b/cloud/rocky-ocp.ks index b9ea934..078ac71 100644 --- a/cloud/rocky-ocp.ks +++ b/cloud/rocky-ocp.ks @@ -7,7 +7,7 @@ repo --name "extras" --baseurl=http://dl.rockylinux.org/stg/rocky/9/extras/$base repo --name="oraclelinux-addons" --baseurl=http://yum.oracle.com/repo/OracleLinux/OL9/addons/$basearch/ --excludepkgs="kernel,WALinuxAgent" --install repo --name=epel --cost=200 --baseurl=https://dl.fedoraproject.org/pub/epel/9/Everything/$basearch/ --install -bootloader --append="console=ttyS0,115200n8 console=tty0 no_timer_check crashkernel=auto net.ifnames=0 LANG=en_US.UTF-8 transparent_hugepage=never rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=rocky rd.lvm.lv=rocky/root rd.net.timeout.dhcp=10" --location=mbr --timeout=1 --boot-drive=vda +bootloader --append="console=ttyS0,115200n8 console=tty0 no_timer_check crashkernel=1G-4G:192M,4G-64G:256M,64G-:512M net.ifnames=0 LANG=en_US.UTF-8 transparent_hugepage=never rd.luks=0 rd.md=0 rd.dm=0 rd.lvm.vg=rocky rd.lvm.lv=rocky/root rd.net.timeout.dhcp=10" --location=mbr --timeout=1 --boot-drive=vda %post --erroronfail