summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Gianelloni <wolf31o2@gentoo.org>2005-07-26 13:29:07 +0000
committerChris Gianelloni <wolf31o2@gentoo.org>2005-07-26 13:29:07 +0000
commit2cc39940f0b7cf66bf95c3c5ab7c21e23fdbe1ce (patch)
tree80e37627d8571158be3c126e00dea3125016d2ff
parentUpdated ppc*.py with updates from Daniel Ostrow <dostrow@gentoo.org>. (diff)
downloadgentoo-2cc39940f0b7cf66bf95c3c5ab7c21e23fdbe1ce.tar.gz
gentoo-2cc39940f0b7cf66bf95c3c5ab7c21e23fdbe1ce.tar.bz2
gentoo-2cc39940f0b7cf66bf95c3c5ab7c21e23fdbe1ce.zip
Added removal of all locales except en_US from all official Gentoo release media. This is catalyst 1.1.10.7.
-rw-r--r--src/catalyst/ChangeLog7
-rw-r--r--src/catalyst/catalyst4
-rw-r--r--src/catalyst/livecd/runscript-support/livecdfs-update.sh9
3 files changed, 16 insertions, 4 deletions
diff --git a/src/catalyst/ChangeLog b/src/catalyst/ChangeLog
index 146b153c9a..787689bbdd 100644
--- a/src/catalyst/ChangeLog
+++ b/src/catalyst/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for gentoo/src/catalyst
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.116 2005/07/23 17:34:48 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/ChangeLog,v 1.198.2.117 2005/07/26 13:29:07 wolf31o2 Exp $
+
+ 26 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+ livecd/runscript-support/livecdfs-update.sh:
+ Added removal of all locales except en_US from all official Gentoo release
+ media. This is catalyst 1.1.10.7.
23 Jul 2005; Chris Gianelloni <wolf31o2@gentoo.org> AUTHORS, arch/ppc.py,
arch/ppc64.py:
diff --git a/src/catalyst/catalyst b/src/catalyst/catalyst
index 7912ce0683..b96b6fbf32 100644
--- a/src/catalyst/catalyst
+++ b/src/catalyst/catalyst
@@ -1,12 +1,12 @@
#!/usr/bin/python
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/catalyst,v 1.68.2.28 2005/07/21 15:02:32 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/Attic/catalyst,v 1.68.2.29 2005/07/26 13:29:07 wolf31o2 Exp $
import os,sys,imp,string,getopt
__maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="1.1.10.6"
+__version__="1.1.10.7"
conf_values={}
diff --git a/src/catalyst/livecd/runscript-support/livecdfs-update.sh b/src/catalyst/livecd/runscript-support/livecdfs-update.sh
index d931e6dbd6..7ed73b519d 100644
--- a/src/catalyst/livecd/runscript-support/livecdfs-update.sh
+++ b/src/catalyst/livecd/runscript-support/livecdfs-update.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.35.2.21 2005/07/14 19:54:13 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/livecd/runscript-support/Attic/livecdfs-update.sh,v 1.35.2.22 2005/07/26 13:29:07 wolf31o2 Exp $
/usr/sbin/env-update
source /etc/profile
@@ -218,3 +218,10 @@ then
rm -rf /usr/lib/hotplug/firmware
ln -sf /lib/firmware /usr/lib/hotplug/firmware
fi
+
+# Clear out locales
+case ${clst_livecd_type} in
+ gentoo-*)
+ rm -rf /usr/lib/locale/{a,b,c,d,e{l,n_{A,B,C,D,G,H,I,N,P,S,US.,Z},s,t,u},f,g,h,i,j,k,l,m,n,o,p,r,s,t,u,v,w,x,y,z}*
+ ;;
+esac