Stick closely to upstream with the UBI image - 8 #7

Merged
neil merged 4 commits from lumarel/kickstarts:ubi8-get-closer-to-upstream into r8 2023-05-12 20:04:34 +00:00
3 changed files with 23 additions and 10 deletions

View File

@ -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

View File

@ -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
lumarel marked this conversation as resolved Outdated
Outdated
Review

I wonder if we should move some of this to container-common...

I will file an issue to refactor this a bit soon :)

I wonder if we should move some of this to container-common... I will file an issue to refactor this a bit soon :)
# 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

View File

@ -10,7 +10,7 @@ shutdown
keyboard us
lang en_US.UTF-8
timezone --isUtc --nontp UTC
timezone --isUtc --nontp Etc/UTC
# Disk setup
zerombr