From ba30a1acfb93abc649786d32392e234a9619a526 Mon Sep 17 00:00:00 2001
From: Neil Hanlon <neil@rockylinux.org>
Date: Tue, 21 Nov 2023 12:43:03 -0500
Subject: [PATCH] update submodule override; remove cruft

---
 diskimage-builder                             |  2 +-
 .../pre-install.d/03-yum-cleanup              | 50 -------------------
 2 files changed, 1 insertion(+), 51 deletions(-)

diff --git a/diskimage-builder b/diskimage-builder
index d06a66d..b2d4d75 160000
--- a/diskimage-builder
+++ b/diskimage-builder
@@ -1 +1 @@
-Subproject commit d06a66d0f019a4ec7ad03390c39ee1e09e87a753
+Subproject commit b2d4d75686d72cb67327736144e0b40b662ca9c4
diff --git a/elements/rocky-minimal-yum/pre-install.d/03-yum-cleanup b/elements/rocky-minimal-yum/pre-install.d/03-yum-cleanup
index e77e4bf..7f3dd2d 100755
--- a/elements/rocky-minimal-yum/pre-install.d/03-yum-cleanup
+++ b/elements/rocky-minimal-yum/pre-install.d/03-yum-cleanup
@@ -23,56 +23,6 @@ set -o pipefail
 
 # effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb --keep-services "$target"
 
-# This is only required on CentOS7 ... see notes in
-# root.d/08-yum-chroot about %_install_langs
-if [[ $DISTRO_NAME == "centos" && $DIB_RELEASE == "7" ]]; then
-
-    # Stripping *all* locales is a bad idea.  For now, we take the
-    # suggestion in [1] for reducing this
-    # [1] https://bugzilla.redhat.com/show_bug.cgi?id=156477
-
-    if [ ! -f /usr/lib/locale/locale-archive ]; then
-        die "locale-archive not found?  Can not do cleanup."
-    fi
-
-    # now the archive has everything in it, and is about 100MiB.  Strip it
-    # to just en_US (basically, this is the locale we support if you ssh
-    # in, other than POSIX)
-    localedef --delete-from-archive \
-        $(localedef --list-archive | grep -v '^en_US' | xargs)
-
-    # This removes the locales from the archive index but doesn't rebuild
-    # the file, so it is still the same size (maybe it is sparse?
-    # presumably as it's mmapped you don't want to fiddle with the offsets
-    # of locales in the archive on a live system.  We are not live).
-
-    # build-locale-archive is a tool provided by the RH packaging of
-    # glibc.  Documentation is scarce, but it takes the pre-built locales
-    # in the tmpl file and creates an archive.  It seems originally the
-    # installer would set some flags to rpm to tell the package what
-    # languages to pick out of the template, but along the way, this was
-    # reverted to install them (size considered less important than locale
-    # support).
-
-    # We hack this by moving the locale-archive we've removed the extra
-    # locales from to the template, then re-run the build.
-    mv /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl
-
-    # rebuild archive from template
-    /usr/sbin/build-locale-archive
-
-    # leave empty template behind as package does.  I think this stops
-    # upgrades redoing things
-    echo > /usr/lib/locale/locale-archive.tmpl
-
-    # remove the unnecessary source locale files and iconv files
-    pushd /usr/share/locale
-    find . ! -name 'locale.alias' -delete
-    popd
-    rm -rf {lib.lib64}/gconv
-
-fi
-
 # docs
 rm -rf /usr/share/{doc,info,gnome/help}
 # i18n