From ffb3552022d7433878a643bfbb3aacb38f5f27de Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Dec 19 2016 20:02:18 +0000 Subject: treecompose-post.sh: no longer manually prune locales Now that rpm-ostree correctly handles the install-langs key, the glibc %post script automatically does the locale pruning for us. This is similar to what we did in F25, but we don't prune non-UTF8 locales here just because it's a bit late to change that for F24. This was causing F24 composes to fail because the grep -a -v wouldn't find any matches (because glibc already pruned everything for us). --- diff --git a/treecompose-post.sh b/treecompose-post.sh index 52d8a1e..2aa1068 100755 --- a/treecompose-post.sh +++ b/treecompose-post.sh @@ -4,10 +4,3 @@ set -xeuo pipefail # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1265295 echo 'Storage=persistent' >> /etc/systemd/journald.conf - -# See: https://bugzilla.redhat.com/show_bug.cgi?id=1051816 -KEEPLANG=en_US -find /usr/share/locale -mindepth 1 -maxdepth 1 -type d -not -name "${KEEPLANG}" -exec rm -rf {} + -localedef --list-archive | grep -a -v ^"${KEEPLANG}" | xargs localedef --delete-from-archive -cp -f /usr/lib/locale/locale-archive /usr/lib/locale/locale-archive.tmpl -build-locale-archive