Set a default locale if missing

This commit is contained in:
Jason Mehring 2015-06-10 17:01:33 -04:00
parent bd9a3bf515
commit 0ccd2c9a98
No known key found for this signature in database
GPG Key ID: 1BB9B1FB5A4C6DAD

View File

@ -277,6 +277,14 @@ if [ ! -f '/etc/sysconfig/ip6tables' -o $1 = 1 ]; then
cp -p /usr/lib/qubes/init/ip6tables /etc/sysconfig/ip6tables cp -p /usr/lib/qubes/init/ip6tables /etc/sysconfig/ip6tables
fi fi
%if %{fedora} >= 20
# Make sure there is a default locale set so gnome-terminal will start
if [ ! -e /etc/locale.conf ] || ! grep -q LANG /etc/locale.conf; then
touch /etc/locale.conf
echo "LANG=en_US.utf8" >> /etc/locale.conf
fi
%endif
if [ "$1" != 1 ] ; then if [ "$1" != 1 ] ; then
# do the rest of %post thing only when updating for the first time... # do the rest of %post thing only when updating for the first time...
exit 0 exit 0
@ -308,6 +316,7 @@ do
mv $f /var/lib/qubes/removed-udev-scripts/ mv $f /var/lib/qubes/removed-udev-scripts/
done done
mkdir -p /rw mkdir -p /rw
#rm -f /etc/mtab #rm -f /etc/mtab
#echo "--> Removing HWADDR setting from /etc/sysconfig/network-scripts/ifcfg-eth0" #echo "--> Removing HWADDR setting from /etc/sysconfig/network-scripts/ifcfg-eth0"
#mv /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0.orig #mv /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0.orig