[PC-BSD Commits] r21836 - pcbsd/current/src-qt4/xtrafiles/local/share/pcbsd/scripts

svn at pcbsd.org svn at pcbsd.org
Tue Mar 12 16:59:30 PDT 2013


Author: kris
Date: 2013-03-12 23:59:30 +0000 (Tue, 12 Mar 2013)
New Revision: 21836

Modified:
   pcbsd/current/src-qt4/xtrafiles/local/share/pcbsd/scripts/set-lang.sh
Log:

Make sure to set /etc/login.conf to the selected Language
during the first run wizard



Modified: pcbsd/current/src-qt4/xtrafiles/local/share/pcbsd/scripts/set-lang.sh
===================================================================
--- pcbsd/current/src-qt4/xtrafiles/local/share/pcbsd/scripts/set-lang.sh	2013-03-12 23:11:37 UTC (rev 21835)
+++ pcbsd/current/src-qt4/xtrafiles/local/share/pcbsd/scripts/set-lang.sh	2013-03-12 23:59:30 UTC (rev 21836)
@@ -7,10 +7,6 @@
 
 echo "$1" >/usr/local/share/pcbsd/conf/system-lang
 
-# Don't do the GDM settings for now, causes issues with GDM not being able to login
-# due to wonky permissions for the /usr/local/etc/gdm/home dir
-exit 0
-
 # Get the full language code
 echo "$1" | grep -q "_"
 if [ $? -eq 0 ] ; then
@@ -23,26 +19,7 @@
   FLANG="${1}_${up}.UTF-8"
 fi
 
-mkdir -p /usr/local/etc/gdm/home/.gconf/apps/gdm/simple-greeter
+# Adjust /etc/login.conf
+sed -i '' "s|en_US.UTF-8|${FLANG}|g" /etc/login.conf
 
-echo "<?xml version=\"1.0\"?>
-<gconf>
-        <entry name=\"recent-layouts\" mtime=\"1322064623\" type=\"list\" ltype=\"string\">
-                <li type=\"string\">
-                        <stringvalue>$2</stringvalue>
-                </li>
-        </entry>
-        <entry name=\"recent-languages\" mtime=\"1322064622\" type=\"list\" ltype=\"string\">
-                <li type=\"string\">
-                        <stringvalue>${FLANG}</stringvalue>
-                </li>
-        </entry>
-</gconf>" > /usr/local/etc/gdm/home/.gconf/apps/gdm/simple-greeter/%gconf.xml
-
-# Set the permissions properly
-chown -R gdm:gdm /usr/local/etc/gdm/home
-chmod 700 /usr/local/etc/gdm/home/.gconf
-chmod 700 /usr/local/etc/gdm/home/.gconf/apps
-chmod 700 /usr/local/etc/gdm/home/.gconf/apps/gdm
-chmod 700 /usr/local/etc/gdm/home/.gconf/apps/gdm/simple-greeter
-chmod -R 600 /usr/local/etc/gdm/home/.gconf/apps/gdm/simple-greeter/%gconf.xml
+exit 0



More information about the Commits mailing list