From decee739cffcf7690d7c43ecc31c9cf9f286931b Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Sun, 1 Sep 2024 14:37:00 -0700 Subject: [PATCH 1/2] add com_redhat_kump addon block --- desktop-8.ks | 3 +++ desktop.ks | 3 +++ desktopencrypt-8.ks | 3 +++ desktopencrypt-aarch64-8.ks | 3 +++ desktopencrypt-aarch64.ks | 3 +++ desktopencrypt.ks | 3 +++ minimal-8.ks | 3 +++ minimal-bios-8.ks | 3 +++ minimal-bios.ks | 3 +++ minimal-uefi.ks | 3 +++ minimal.ks | 3 +++ server-8.ks | 3 +++ server.ks | 3 +++ support-8.ks | 3 +++ support.ks | 3 +++ uploads/freeipa.ks | 3 +++ uploads/freeipaclient.ks | 3 +++ uploads/root-user-crypted-net-8.ks | 3 +++ uploads/root-user-crypted-net-9.ks | 3 +++ 19 files changed, 57 insertions(+) diff --git a/desktop-8.ks b/desktop-8.ks index cef18f1..c070955 100644 --- a/desktop-8.ks +++ b/desktop-8.ks @@ -17,6 +17,9 @@ text -selinux-policy-minimum %end +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end + %post touch $INSTALL_ROOT/home/home_preserved %end diff --git a/desktop.ks b/desktop.ks index e8e7a93..6696228 100644 --- a/desktop.ks +++ b/desktop.ks @@ -17,6 +17,9 @@ text -selinux-policy-minimum %end +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end + %post touch $INSTALL_ROOT/home/home_preserved %end diff --git a/desktopencrypt-8.ks b/desktopencrypt-8.ks index cccb6d2..3dee3f2 100644 --- a/desktopencrypt-8.ks +++ b/desktopencrypt-8.ks @@ -16,3 +16,6 @@ text @^workstation-product-environment -selinux-policy-minimum %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/desktopencrypt-aarch64-8.ks b/desktopencrypt-aarch64-8.ks index dd98584..1c538f2 100644 --- a/desktopencrypt-aarch64-8.ks +++ b/desktopencrypt-aarch64-8.ks @@ -16,3 +16,6 @@ text @^workstation-product-environment -selinux-policy-minimum %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/desktopencrypt-aarch64.ks b/desktopencrypt-aarch64.ks index 0f67951..1253427 100644 --- a/desktopencrypt-aarch64.ks +++ b/desktopencrypt-aarch64.ks @@ -16,3 +16,6 @@ text @^workstation-product-environment -selinux-policy-minimum %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/desktopencrypt.ks b/desktopencrypt.ks index 403121b..3c58a80 100644 --- a/desktopencrypt.ks +++ b/desktopencrypt.ks @@ -16,3 +16,6 @@ text @^workstation-product-environment -selinux-policy-minimum %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/minimal-8.ks b/minimal-8.ks index 29f50d6..ec4c19d 100644 --- a/minimal-8.ks +++ b/minimal-8.ks @@ -14,6 +14,9 @@ text @core %end +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end + %post touch $INSTALL_ROOT/home/home_preserved %end diff --git a/minimal-bios-8.ks b/minimal-bios-8.ks index 29f50d6..ec4c19d 100644 --- a/minimal-bios-8.ks +++ b/minimal-bios-8.ks @@ -14,6 +14,9 @@ text @core %end +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end + %post touch $INSTALL_ROOT/home/home_preserved %end diff --git a/minimal-bios.ks b/minimal-bios.ks index bfd56f4..37803de 100644 --- a/minimal-bios.ks +++ b/minimal-bios.ks @@ -13,3 +13,6 @@ text %packages @core %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/minimal-uefi.ks b/minimal-uefi.ks index 39cc942..0e8f82a 100644 --- a/minimal-uefi.ks +++ b/minimal-uefi.ks @@ -14,6 +14,9 @@ text @core %end +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end + %post touch $INSTALL_ROOT/home/home_preserved %end diff --git a/minimal.ks b/minimal.ks index 39cc942..0e8f82a 100644 --- a/minimal.ks +++ b/minimal.ks @@ -14,6 +14,9 @@ text @core %end +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end + %post touch $INSTALL_ROOT/home/home_preserved %end diff --git a/server-8.ks b/server-8.ks index dc1a2a2..ee1f223 100644 --- a/server-8.ks +++ b/server-8.ks @@ -15,3 +15,6 @@ text @^server-product-environment plymouth-system-theme %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/server.ks b/server.ks index ce5a015..8ecd15e 100644 --- a/server.ks +++ b/server.ks @@ -15,3 +15,6 @@ text @^server-product-environment plymouth-system-theme %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/support-8.ks b/support-8.ks index 7d3797a..67f3a97 100644 --- a/support-8.ks +++ b/support-8.ks @@ -18,3 +18,6 @@ targetcli nfs-utils dnsmasq %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/support.ks b/support.ks index 39ccb91..e8286c4 100644 --- a/support.ks +++ b/support.ks @@ -18,3 +18,6 @@ targetcli nfs-utils dnsmasq %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/uploads/freeipa.ks b/uploads/freeipa.ks index 018fa32..1034965 100644 --- a/uploads/freeipa.ks +++ b/uploads/freeipa.ks @@ -14,3 +14,6 @@ createrepo_c %end rootpw anaconda reboot + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/uploads/freeipaclient.ks b/uploads/freeipaclient.ks index 699663c..3ddd1e6 100644 --- a/uploads/freeipaclient.ks +++ b/uploads/freeipaclient.ks @@ -12,3 +12,6 @@ autopart rootpw anaconda reboot realm join --one-time-password=monkeys ipa001.test.openqa.rockylinux.org + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/uploads/root-user-crypted-net-8.ks b/uploads/root-user-crypted-net-8.ks index b77295b..ed2642a 100644 --- a/uploads/root-user-crypted-net-8.ks +++ b/uploads/root-user-crypted-net-8.ks @@ -15,3 +15,6 @@ reboot %packages @core %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end diff --git a/uploads/root-user-crypted-net-9.ks b/uploads/root-user-crypted-net-9.ks index 7ba019c..a49e5fe 100644 --- a/uploads/root-user-crypted-net-9.ks +++ b/uploads/root-user-crypted-net-9.ks @@ -15,3 +15,6 @@ reboot %packages @core %end + +%addon com_redhat_kdump --enable --reserve-mb='auto' +%end From b101f46507428697a378a6bbf545034e81fa12ae Mon Sep 17 00:00:00 2001 From: Trevor Cooper Date: Sun, 1 Sep 2024 14:37:37 -0700 Subject: [PATCH 2/2] update README for Rocky Linux --- README.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 6292527..10b23ad 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ Optional keys are: * `filesystem` - if set, this partition will *always* have this filesystem. If not set, the filesystem will be determined according to the image group's `filesystems` value (see below). * `label` - if set, this partition will have this label * `gpt-type` - if set, the partition will be of the type defined by the partition GUID. + #### `writes` This key is **optional**. Its value is a list of dicts. Each dict represents a single file that should be created on one of the partitions in the image. There are exactly three required keys for the dict: @@ -99,11 +100,11 @@ Whew! That was a lot of explanation, but it's not really a super-complicated con #### `releases` -This key is **required**. It defines the releases and arches for which images are expected; thus it determines the number of images that will be expected for this group. The value is a dict. Each key in the dict represents a release; the value for each key is a list of the arches for which images should be built for that release. The keys should be integer digit strings. **Positive** values indicate absolute release numbers. **Negative** values are relative to whatever is the pending release at the time the images are created. So a release number `-1` means 'the release one before the pending release at the time the images are built'. So if the next Rocky Linux release will be Fedora 24 at the time the images are created, and one of the dict keys is `-1`, an image will be expected for Fedora 23. +This key is **required**. It defines the releases and arches for which images are expected; thus it determines the number of images that will be expected for this group. The value is a dict. Each key in the dict represents a release; the value for each key is a list of the arches for which images should be built for that release. The keys should be **Positive** integer digit strings. A release number of `9` means Rocky Linux major version 9. The Rocky Linux minor version used to create the installed machine is controlled by the symlinks on the download server. -The filename for a virt-install type image always includes the release number and arch it's built for - `disk_f(release)_(name)_(arch).img`. +The filename for a virt-install type image always includes the release number and arch it's built for - `disk_rocky(release)_(name)_(arch).img`. -Let's look at an example! Say the `name` is `minimal` and the `releases` dict is `{ "-1" : ["i686", "x86_64"], "-2" : ["x86_64"] }`. Three images will be expected, and the expected releases will be relevant to the pending release. Say the pending release is Fedora 24, the expected images will be `disk_f23_minimal_i686.img` (Fedora 23 for i686), `disk_f23_minimal_x86_64.img` (Fedora 23 for x86_64), and `disk_f22_minimal_x86_64.img` (Fedora 22 for x86_64). When time moves on and the next pending release is F25, images will be expected for Fedora 23 and Fedora 24, and the Fedora 22 images will be considered obsolete and deleted by cleanup modes of `createhdds`. +Let's look at an example! Say the `name` is `minimal` and the `releases` dict is `{ "9" : ["x86_64"], "9" : ["x86_64"] }`. Two images will be expected with names `disk_rocky8_minimal_x86_64.img` (Rocky Linux 8 for x86_64) and `disk_rocky9_minimal_x86_64.img` (Rocky Linux 9 for x86_64). As with the `guestfs` case, the single image group subcommand will have parameters to limit creation. So in our example, the `minimal` subcommand will have `--release` and `--arch` parameters, each allowing just a single value. For coding simplicity, passing `--arch` alone is ignored (this may be fixed later) and will just result in the 'expected' images being created. If `--release` is passed, only a single image will be created, for whatever release is specified; by default it will be the x86_64 image, you may pass `--arch (arch)` to build another arch instead.