[PC-BSD Commits] r4871 - in pcbsd/trunk/pc-sysinstall: . backend

[svn at pcbsd.org]

Author: kris
Date: 2009-11-04 11:42:59 -0800 (Wed, 04 Nov 2009)
New Revision: 4871

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh
   pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh
   pcbsd/trunk/pc-sysinstall/pcinstall.cfg
Log:

Fixed some bugs with localization, and fixed extracting image from downloaded archive



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-11-04 18:39:35 UTC (rev 4870)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-11-04 19:42:59 UTC (rev 4871)
@@ -47,7 +47,7 @@
          umount ${FSMNT}.uzip
          mdconfig -d -u ${MDDEVICE}
          ;;
-    tar) tar -xpv -C ${FSMNT} -f ${CDMNT}/${INSFILE} ${TAROPTS} >&1 2>&1
+    tar) tar -xpv -C ${FSMNT} -f ${INSFILE} ${TAROPTS} >&1 2>&1
          if [ "$?" != "0" ]
          then
            exit_err "ERROR: Failed extracting the tar image"
@@ -124,9 +124,11 @@
   case ${INSTALLMEDIUM} in
      dvd) # Lets start by mounting the disk 
           opt_mount 
+          INSFILE="${CDMNT}/${INSFILE}" ; export INSFILE
           start_extract_uzip_tar
           ;;
      usb) usb_mount
+          INSFILE="${CDMNT}/${INSFILE}" ; export INSFILE
 	  start_extract_uzip_tar ;;
      ftp) fetch_install_file
           start_extract_uzip_tar ;;

Modified: pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh	2009-11-04 18:39:35 UTC (rev 4870)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh	2009-11-04 19:42:59 UTC (rev 4871)
@@ -17,19 +17,13 @@
 {
   #Change the skel files
   ##########################################################################
-  sed -i.bak "s/Country=us/Country=${COUNTRY}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals
+  sed -i.bak "s/Country=C/Country=${COUNTRY}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals
 
-  sed -i.bak "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals
+  sed -i.bak "s/Language=en_US.UTF-8S/Language=${SETLANG}/g" ${FSMNT}/usr/share/skel/.kde4/share/config/kdeglobals
 
-  #Change the root files
-  ##########################################################################
-  sed -i.bak "s/Country=C/Country=${COUNTRY}/g" ${FSMNT}/root/.kde4/share/config/kdeglobals
-
-  sed -i.bak "s/Language=en_US/Language=${SETLANG}/g" ${FSMNT}/root/.kde4/share/config/kdeglobals
-
   #Change KDM Langs
   ##########################################################################
-  sed -i.bak "s/Language=en_US/Language=${SETKDMLANG}/g" ${FSMNT}/usr/local/kde4/share/config/kdm/kdmrc
+  sed -i.bak "s/Language=/Language=${SETKDMLANG}/g" ${FSMNT}/usr/local/kde4/share/config/kdm/kdmrc
 
 };
 

Modified: pcbsd/trunk/pc-sysinstall/pcinstall.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-11-04 18:39:35 UTC (rev 4870)
+++ pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-11-04 19:42:59 UTC (rev 4871)
@@ -35,14 +35,15 @@
 #netSaveDefaultRouter=192.168.0.1
 
 # Set if we are installing via optical, USB, or FTP
-installType=PCBSD
-installMedium=dvd
-#installMedium=ftp
+#installType=PCBSD
+installType=FreeBSD
+#installMedium=dvd
+installMedium=ftp
 
 ftpPath=ftp://192.168.0.2/netinstall
 
-packageType=uzip
-#packageType=tar
+#packageType=uzip
+packageType=tar
 #installComponents=ports,src
 commitInstall