Merge pull request 'Stick closely to upstream with the UBI image - 9' (#8) from lumarel/kickstarts:ubi9-get-closer-to-upstream into r9

Reviewed-on: sig_core/kickstarts#8
This commit is contained in:
Louis Abel 2023-05-09 17:47:34 +00:00
commit f9413603da
3 changed files with 23 additions and 12 deletions

View File

@ -15,7 +15,7 @@ shutdown
keyboard us keyboard us
lang en_US.UTF-8 lang en_US.UTF-8
timezone --utc --nontp UTC timezone --utc --nontp Etc/UTC
# Disk setup # Disk setup
zerombr zerombr
@ -27,23 +27,22 @@ autopart --noboot --nohome --noswap --nolvm --fstype=ext4
%end %end
# Package setup # Package setup
# NOTE(nhanlon) - 2022-11-23 adding --ignoremissing as dmidecode does not exist on all arches
%packages --ignoremissing --excludedocs --inst-langs=en --nocore --exclude-weakdeps %packages --ignoremissing --excludedocs --inst-langs=en --nocore --exclude-weakdeps
bash bash
binutils
brotli
coreutils-single coreutils-single
crypto-policies-scripts crypto-policies-scripts
dmidecode curl-minimal
findutils findutils
gdb-gdbserver
glibc-minimal-langpack glibc-minimal-langpack
libcurl gzip
libcurl-minimal
systemd systemd
rocky-release rocky-release
rootfiles rootfiles
tar tar
vim-minimal
util-linux util-linux
vim-minimal
which which
yum yum
@ -68,6 +67,7 @@ yum
%end %end
%post --erroronfail --log=/root/anaconda-post.log %post --erroronfail --log=/root/anaconda-post.log
set -eux
# container customizations inside the chroot # container customizations inside the chroot
# Stay compatible # Stay compatible
@ -97,10 +97,15 @@ systemctl mask \
systemd-logind.service \ systemd-logind.service \
systemd-remount-fs.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 # Cleanup the image
rm -f /etc/udev/hwdb.bin rm -f /etc/udev/hwdb.bin
rm -rf /usr/lib/udev/hwdb.d/ \ rm -rf /usr/lib/udev/hwdb.d/ \
/boot /var/lib/dnf/history.* \ /boot /var/lib/dnf/history.* \
/var/cache/* /var/log/* \
"/tmp/*" "/tmp/.*" || true "/tmp/*" "/tmp/.*" || true

View File

@ -2,14 +2,14 @@
%packages --excludedocs --inst-langs=en --nocore --exclude-weakdeps %packages --excludedocs --inst-langs=en --nocore --exclude-weakdeps
bash bash
binutils
brotli
coreutils-single coreutils-single
crypto-policies-scripts crypto-policies-scripts
dmidecode curl-minimal
findutils findutils
gdb-gdbserver
glibc-minimal-langpack glibc-minimal-langpack
libcurl gzip
libcurl-minimal
systemd systemd
rocky-release rocky-release
rootfiles rootfiles
@ -40,6 +40,7 @@ yum
%end %end
%post --erroronfail --log=/root/anaconda-post.log %post --erroronfail --log=/root/anaconda-post.log
set -eux
# container customizations inside the chroot # container customizations inside the chroot
# Stay compatible # Stay compatible
@ -69,10 +70,15 @@ systemctl mask \
systemd-logind.service \ systemd-logind.service \
systemd-remount-fs.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 # Cleanup the image
rm -f /etc/udev/hwdb.bin rm -f /etc/udev/hwdb.bin
rm -rf /usr/lib/udev/hwdb.d/ \ rm -rf /usr/lib/udev/hwdb.d/ \
/boot /var/lib/dnf/history.* \ /boot /var/lib/dnf/history.* \
/var/cache/* /var/log/* \
"/tmp/*" "/tmp/.*" || true "/tmp/*" "/tmp/.*" || true

View File

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