summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-10-04 21:48:30 +0000
committerJeremy Katz <katzj@redhat.com>2006-10-04 21:48:30 +0000
commitd0471c9a797c7e9b2c7db6320db527ddfdeaede4 (patch)
treec6717385d91536a0cc62c5f151a67f71366073e3
parent16c30c7a5f3751e98c20983a8187ce9071474d4e (diff)
downloadanaconda-d0471c9a797c7e9b2c7db6320db527ddfdeaede4.tar.gz
anaconda-d0471c9a797c7e9b2c7db6320db527ddfdeaede4.tar.xz
anaconda-d0471c9a797c7e9b2c7db6320db527ddfdeaede4.zip
2006-10-04 Jeremy Katz <katzj@redhat.com>
* scripts/upd-instroot: Not having a locale archive actually seems to fix sr_CS.UTF-8@Latn and doesn't actually take more space (#182591)
-rw-r--r--ChangeLog3
-rwxr-xr-xscripts/upd-instroot12
2 files changed, 3 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index b540013ec..f263b9ed2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-10-04 Jeremy Katz <katzj@redhat.com>
+ * scripts/upd-instroot: Not having a locale archive actually seems
+ to fix sr_CS.UTF-8@Latn and doesn't actually take more space (#182591)
+
* yuminstall.py (YumBackend.checkSupportedUpgrade): Fix traceback
going back (#205198)
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 16c367abb..b6867c1dd 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -457,7 +457,6 @@ usr/sbin/genhomedircon
sbin/setfiles
usr/sbin/lvm
usr/sbin/gptsync
-usr/sbin/build-locale-archive
usr/share/anaconda/anaconda.conf
usr/share/selinux/targeted/base.pp
usr/share/system-config-date/zonetab.py*
@@ -997,17 +996,6 @@ LC_ALL=C comm -13 $DESTGR/locales $DESTGR/locales.list | xargs rm -rf
); done
rm -f $DESTGR/locales $DESTGR/locales.list
-# now, create a locale archive and nuke the locale dirs since
-# that ends up taking less space
-for p in $DEST $DESTGR; do
- echo "Building locale archive"
- /usr/sbin/chroot $p /usr/sbin/build-locale-archive
- mv $p/usr/lib/locale/locale-archive $p/usr/lib/locale-archive
- rm -rf $p/usr/lib/locale/*
- rm -f $p/usr/sbin/build-locale-archive
- mv $p/usr/lib/locale-archive $p/usr/lib/locale/locale-archive
-done
-
# fixup joe links
if [ -n "$NEEDGR" ]; then
ln -fs jpicorc $DESTGR/etc/joe/picorc