From 7c8f50614a8508bf3690af09dbec9f45a0e6047c Mon Sep 17 00:00:00 2001 From: lumarel Date: Sun, 2 Apr 2023 12:08:08 +0200 Subject: [PATCH 1/3] Use Etc/UTC as upstream does --- container/rocky-container.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/container/rocky-container.ks b/container/rocky-container.ks index 6230193..1930712 100644 --- a/container/rocky-container.ks +++ b/container/rocky-container.ks @@ -10,7 +10,7 @@ shutdown keyboard us lang en_US.UTF-8 -timezone --isUtc --nontp UTC +timezone --isUtc --nontp Etc/UTC # Disk setup zerombr -- 2.39.3 From af63f7a1baad824ca2575826414e22a6260fd1cb Mon Sep 17 00:00:00 2001 From: lumarel Date: Sun, 2 Apr 2023 12:11:02 +0200 Subject: [PATCH 2/3] Get closer to upstream with the ubi image --- container/rocky-container-ubi.ks | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/container/rocky-container-ubi.ks b/container/rocky-container-ubi.ks index 582f2a7..58302a8 100644 --- a/container/rocky-container-ubi.ks +++ b/container/rocky-container-ubi.ks @@ -2,14 +2,14 @@ %packages --ignoremissing --excludedocs --instLangs=en --nocore --excludeWeakdeps bash -binutils -brotli coreutils-single crypto-policies-scripts -dmidecode +curl-minimal findutils +gdb-gdbserver glibc-minimal-langpack -libcurl +gzip +libcurl-minimal systemd rocky-release rootfiles @@ -40,6 +40,7 @@ yum %end %post --erroronfail --log=/root/anaconda-post.log +set -eux # container customizations inside the chroot # Stay compatible @@ -69,10 +70,15 @@ systemctl mask \ systemd-logind.service \ systemd-remount-fs.service +# Remove network configuration files leftover from anaconda installation +# https://bugzilla.redhat.com/show_bug.cgi?id=1713089 +rm -f /etc/sysconfig/network-scripts/ifcfg-* + # Cleanup the image rm -f /etc/udev/hwdb.bin rm -rf /usr/lib/udev/hwdb.d/ \ /boot /var/lib/dnf/history.* \ + /var/cache/* /var/log/* \ /tmp/* /tmp/.* || true %end -- 2.39.3 From 819199c0de339285be445289f0bd78f25b41a18d Mon Sep 17 00:00:00 2001 From: lumarel Date: Sun, 2 Apr 2023 15:45:56 +0200 Subject: [PATCH 3/3] Merge into the combined ks file --- Rocky-8-Container-UBI.ks | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/Rocky-8-Container-UBI.ks b/Rocky-8-Container-UBI.ks index 7bff631..e481957 100644 --- a/Rocky-8-Container-UBI.ks +++ b/Rocky-8-Container-UBI.ks @@ -15,7 +15,7 @@ shutdown keyboard us lang en_US.UTF-8 -timezone --isUtc --nontp UTC +timezone --isUtc --nontp Etc/UTC # Disk setup zerombr @@ -31,14 +31,15 @@ dbus-broker-launch --scope=none # Package setup %packages --ignoremissing --excludedocs --instLangs=en --nocore --excludeWeakdeps bash -binutils -brotli coreutils-single crypto-policies-scripts -dmidecode +curl-minimal findutils +gdb-gdbserver glibc-minimal-langpack -libcurl +gzip +libcurl-minimal +systemd rocky-release rootfiles tar @@ -68,6 +69,7 @@ yum %end %post --erroronfail --log=/root/anaconda-post.log +set -eux # container customizations inside the chroot # Stay compatible @@ -97,10 +99,15 @@ systemctl mask \ systemd-logind.service \ systemd-remount-fs.service +# Remove network configuration files leftover from anaconda installation +# https://bugzilla.redhat.com/show_bug.cgi?id=1713089 +rm -f /etc/sysconfig/network-scripts/ifcfg-* + # Cleanup the image rm -f /etc/udev/hwdb.bin rm -rf /usr/lib/udev/hwdb.d/ \ /boot /var/lib/dnf/history.* \ + /var/cache/* /var/log/* \ /tmp/* /tmp/.* || true %end -- 2.39.3