[gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/

[Devan Franchini]

commit:     d78366a1102d91568e9412d5b847d12a3443c7c3
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 23 14:34:52 2014 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 23 14:47:08 2014 +0000
URL:        
http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=d78366a1

tools-hardened/desktop/*-run.sh: Explicitly sets locale to en_US.utf8

---
 tools-hardened/desktop/fluxbox-run.sh | 2 +-
 tools-hardened/desktop/gnome3-run.sh  | 2 +-
 tools-hardened/desktop/xfce4-run.sh   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tools-hardened/desktop/fluxbox-run.sh 
b/tools-hardened/desktop/fluxbox-run.sh
index 28bbe50..8e793cc 100755
--- a/tools-hardened/desktop/fluxbox-run.sh
+++ b/tools-hardened/desktop/fluxbox-run.sh
@@ -71,7 +71,7 @@ setup_confs() {
 
        cp -a files/locale/locale.gen "${ROOTFS}"/etc/
        chroot "${ROOTFS}"/ locale-gen
-       chroot "${ROOTFS}"/ eselect locale set 3
+       chroot "${ROOTFS}"/ eselect locale set en_US.utf8
        cp -a files/locale/02locale "${ROOTFS}"/etc/conf.d/
        # In kernels 3.9 and above, we must disallow-other-stacks because of 
SO_REUSEPORT 
        sed -i 's/^#\(disallow-other-stacks=\)no/\1yes/g' 
"${ROOTFS}"/etc/avahi/avahi-daemon.conf

diff --git a/tools-hardened/desktop/gnome3-run.sh 
b/tools-hardened/desktop/gnome3-run.sh
index 8b6bc73..ab782e2 100755
--- a/tools-hardened/desktop/gnome3-run.sh
+++ b/tools-hardened/desktop/gnome3-run.sh
@@ -62,7 +62,7 @@ setup_confs() {
 
        cp -a files/locale/locale.gen "${ROOTFS}"/etc/
        chroot "${ROOTFS}"/ locale-gen
-
+       chroot "${ROOTFS}"/ eselect locale set en_US.utf8
        cp -a files/locale/02locale "${ROOTFS}"/etc/conf.d/
        # In kernels 3.9 and above, we must disallow-other-stacks because of 
SO_REUSEPORT 
        sed -i 's/^#\(disallow-other-stacks=\)no/\1yes/g' 
"${ROOTFS}"/etc/avahi/avahi-daemon.conf

diff --git a/tools-hardened/desktop/xfce4-run.sh 
b/tools-hardened/desktop/xfce4-run.sh
index 951dab0..c8a5a17 100755
--- a/tools-hardened/desktop/xfce4-run.sh
+++ b/tools-hardened/desktop/xfce4-run.sh
@@ -65,7 +65,7 @@ setup_confs() {
 
        cp -a files/locale/locale.gen "${ROOTFS}"/etc/
        chroot "${ROOTFS}"/ locale-gen
-       chroot "${ROOTFS}"/ eselect locale set 3
+       chroot "${ROOTFS}"/ eselect locale set en_US.utf8
        cp -a files/locale/02locale "${ROOTFS}"/etc/conf.d/
        # In kernels 3.9 and above, we must disallow-other-stacks because of 
SO_REUSEPORT 
        sed -i 's/^#\(disallow-other-stacks=\)no/\1yes/g' 
"${ROOTFS}"/etc/avahi/avahi-daemon.conf