From c667705f9f23bce10e470daf61e8dfb7d82e0904 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Thu, 1 Sep 2022 11:14:37 +0100 Subject: [PATCH 1/4] Adds the rocky-container-generic element This makes the rocky-container build more like the generic cloud image, see: https://git.rockylinux.org/rocky/kickstarts/-/blob/r8/Rocky-8-GenericCloud.ks --- elements/rocky-container-generic/element-deps | 3 + .../package-installs.yaml | 79 +++++++++++++++++++ .../post-install.d/50-cloud-init | 8 ++ .../pre-install.d/00-02-reinstall-core | 9 +++ 4 files changed, 99 insertions(+) create mode 100644 elements/rocky-container-generic/element-deps create mode 100644 elements/rocky-container-generic/package-installs.yaml create mode 100755 elements/rocky-container-generic/post-install.d/50-cloud-init create mode 100755 elements/rocky-container-generic/pre-install.d/00-02-reinstall-core diff --git a/elements/rocky-container-generic/element-deps b/elements/rocky-container-generic/element-deps new file mode 100644 index 0000000..7f249cd --- /dev/null +++ b/elements/rocky-container-generic/element-deps @@ -0,0 +1,3 @@ +rocky-container +package-installs +cloud-init-datasources \ No newline at end of file diff --git a/elements/rocky-container-generic/package-installs.yaml b/elements/rocky-container-generic/package-installs.yaml new file mode 100644 index 0000000..f6fb54a --- /dev/null +++ b/elements/rocky-container-generic/package-installs.yaml @@ -0,0 +1,79 @@ +# List taken from https://git.rockylinux.org/rocky/kickstarts/-/blob/r8/Rocky-8-GenericCloud.ks + +chrony: +dnf: +yum: +cloud-init: +cloud-utils-growpart: +NetworkManager: +dracut-config-generic: +dracut-norescue: +firewalld: +gdisk: +grub2: +kernel: +nfs-utils: +rsync: +tar: +dnf-utils: +yum-utils: +python3-jsonschema: +qemu-guest-agent: +dhcp-client: +rocky-release: +rng-tools: + +aic94xx-firmware: + uninstall: true +alsa-firmware: + uninstall: true +alsa-lib: + uninstall: true +alsa-tools-firmware: + uninstall: true +ivtv-firmware: + uninstall: true +iwl100-firmware: + uninstall: true +iwl1000-firmware: + uninstall: true +iwl105-firmware: + uninstall: true +iwl135-firmware: + uninstall: true +iwl2000-firmware: + uninstall: true +iwl2030-firmware: + uninstall: true +iwl3160-firmware: + uninstall: true +iwl3945-firmware: + uninstall: true +iwl4965-firmware: + uninstall: true +iwl5000-firmware: + uninstall: true +iwl5150-firmware: + uninstall: true +iwl6000-firmware: + uninstall: true +iwl6000g2a-firmware: + uninstall: true +iwl6000g2b-firmware: + uninstall: true +iwl6050-firmware: + uninstall: true +iwl7260-firmware: + uninstall: true +libertas-sd8686-firmware: + uninstall: true +libertas-sd8787-firmware: + uninstall: true +libertas-usb8388-firmware: + uninstall: true +biosdevname: + uninstall: true +iprutils: + uninstall: true +plymouth: + uninstall: true diff --git a/elements/rocky-container-generic/post-install.d/50-cloud-init b/elements/rocky-container-generic/post-install.d/50-cloud-init new file mode 100755 index 0000000..e686b8f --- /dev/null +++ b/elements/rocky-container-generic/post-install.d/50-cloud-init @@ -0,0 +1,8 @@ +if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then + set -x +fi +set -eu +set -o pipefail + +echo -e 'rocky\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers +sed -i 's/name: cloud-user/name: rocky/g' /etc/cloud/cloud.cfg diff --git a/elements/rocky-container-generic/pre-install.d/00-02-reinstall-core b/elements/rocky-container-generic/pre-install.d/00-02-reinstall-core new file mode 100755 index 0000000..8b2ece9 --- /dev/null +++ b/elements/rocky-container-generic/pre-install.d/00-02-reinstall-core @@ -0,0 +1,9 @@ +if [ ${DIB_DEBUG_TRACE:-0} -gt 0 ]; then + set -x +fi +set -eu +set -o pipefail + +# RUN this after DIB_DISTRIBUTION_MIRROR has been set up. It installs a +# load of missing packages from the container image +dnf install -y @core --allowerasing \ No newline at end of file From f87f7ab37fdfc396dabb1dbc7af6186d6727f883 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Thu, 1 Sep 2022 15:28:26 +0100 Subject: [PATCH 2/4] Prune uninstall list Can end up removing dependencies from other elements, so its porbbaly best to keep this list minimal. --- elements/rocky-container-generic/package-installs.yaml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/elements/rocky-container-generic/package-installs.yaml b/elements/rocky-container-generic/package-installs.yaml index f6fb54a..3e5f413 100644 --- a/elements/rocky-container-generic/package-installs.yaml +++ b/elements/rocky-container-generic/package-installs.yaml @@ -71,9 +71,5 @@ libertas-sd8787-firmware: uninstall: true libertas-usb8388-firmware: uninstall: true -biosdevname: - uninstall: true -iprutils: - uninstall: true plymouth: uninstall: true From 8e47f6d1168fb4c17aec283a36a8bcdd3205c900 Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Thu, 20 Oct 2022 10:41:03 +0100 Subject: [PATCH 3/4] Update elements/rocky-container-generic/package-installs.yaml Remove non-existing package --- elements/rocky-container-generic/package-installs.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/elements/rocky-container-generic/package-installs.yaml b/elements/rocky-container-generic/package-installs.yaml index 3e5f413..644be5a 100644 --- a/elements/rocky-container-generic/package-installs.yaml +++ b/elements/rocky-container-generic/package-installs.yaml @@ -7,7 +7,6 @@ cloud-init: cloud-utils-growpart: NetworkManager: dracut-config-generic: -dracut-norescue: firewalld: gdisk: grub2: From a0e6cf84e5f6bc3eae485f0a84bfdf1f1b42424e Mon Sep 17 00:00:00 2001 From: Will Szumski Date: Thu, 20 Oct 2022 10:41:28 +0100 Subject: [PATCH 4/4] Remove whitespace --- elements/rocky-container-generic/package-installs.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/elements/rocky-container-generic/package-installs.yaml b/elements/rocky-container-generic/package-installs.yaml index 644be5a..729f51e 100644 --- a/elements/rocky-container-generic/package-installs.yaml +++ b/elements/rocky-container-generic/package-installs.yaml @@ -21,7 +21,6 @@ qemu-guest-agent: dhcp-client: rocky-release: rng-tools: - aic94xx-firmware: uninstall: true alsa-firmware: