[PC-BSD Commits] r3749 - pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts

[svn at pcbsd.org]

Author: kris
Date: 2009-04-02 14:10:27 -0700 (Thu, 02 Apr 2009)
New Revision: 3749

Modified:
   pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
Log:

Fixed a bug when doing an upgrade, be sure to run the localization script *after* we copy the kde4 template config files.



Modified: pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh
===================================================================
--- pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-04-02 20:58:46 UTC (rev 3748)
+++ pcbsd/trunk/installcd-overlay/usr/local/pcbsd/scripts/PCBSD.SysConfig.sh	2009-04-02 21:10:27 UTC (rev 3749)
@@ -40,37 +40,9 @@
 chmod 7755 ${FSMNT}/sbin/umount
 
 
-
 # Copy the new splash screen over
 cp ${FSMNT}/PCBSD/splash-screens/loading-screen-en.pcx ${FSMNT}/boot/loading-screen.pcx
 
-# Setup the Localization
-if [ "${LANG}" != "en" ]
-then
-   # Copy the right splash screen over
-    cp ${FSMNT}/PCBSD/splash-screens/loading-screen-${LANG}.pcx ${FSMNT}/boot/loading-screen.pcx
-   # Run the Localize script
-   /usr/local/pcbsd/scripts/PCBSD.Localize.sh ${LANG} ${KEYLAYOUT}
-else
-
-  # Remove the keyboard switcher from loading
-  rm ${FSMNT}/usr/share/skel/.kde4/share/config/kxkbrc
-  rm ${FSMNT}/root/.kde4/share/config/kxkbrc
-
-  # Remove it from the user profiles as well
-  cd ${FSMNT}/usr/home
-  for i in `ls`
-  do
-    rm ${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc
-  done
-  cd / 
-
-fi
-
-# Copy over some of the skel files to /root
-cp ${FSMNT}/usr/share/skel/dot.cshrc ${FSMNT}/root/.cshrc
-
-
 # Copy over the working xorg.conf file from the install CD to the booted
 # system. This will allow us to run the Xorg configuration tool at first boot
 cat /etc/X11/xorg.conf | sed 's|/usr/local|/PCBSD/local|g' > ${FSMNT}/etc/X11/xorg.conf
@@ -141,6 +113,32 @@
   /usr/local/pcbsd/scripts/PCBSD.PostUpgrade.sh
 fi
 
+# Setup the Localization
+if [ "${LANG}" != "en" ]
+then
+   # Copy the right splash screen over
+    cp ${FSMNT}/PCBSD/splash-screens/loading-screen-${LANG}.pcx ${FSMNT}/boot/loading-screen.pcx
+   # Run the Localize script
+   /usr/local/pcbsd/scripts/PCBSD.Localize.sh ${LANG} ${KEYLAYOUT}
+else
+
+  # Remove the keyboard switcher from loading
+  rm ${FSMNT}/usr/share/skel/.kde4/share/config/kxkbrc
+  rm ${FSMNT}/root/.kde4/share/config/kxkbrc
+
+  # Remove it from the user profiles as well
+  cd ${FSMNT}/usr/home
+  for i in `ls`
+  do
+    rm ${FSMNT}/usr/home/${i}/.kde4/share/config/kxkbrc
+  done
+  cd / 
+
+fi
+
+# Copy over some of the skel files to /root
+cp ${FSMNT}/usr/share/skel/dot.cshrc ${FSMNT}/root/.cshrc
+
 # Make sure each dir is "chowned" properly
 /usr/local/pcbsd/scripts/PCBSD.SetUserPerms.sh