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

svn at pcbsd.org svn at pcbsd.org
Wed Nov 4 10:18:21 PST 2009


Author: kris
Date: 2009-11-04 10:18:21 -0800 (Wed, 04 Nov 2009)
New Revision: 4869

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

Fix typos in localize script, and started adding support for net/ftp installs



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-11-04 17:58:14 UTC (rev 4868)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-11-04 18:18:21 UTC (rev 4869)
@@ -39,6 +39,9 @@
          fi
          cd ${FSMNT}.uzip
 
+         rm ${FSMNT}/.read.log >/dev/null 2>/dev/null
+         rm ${FSMNT}/.extract.log >/dev/null 2>/dev/null
+
          # Copy over all the files now!
          tar cvf - . 2>>${FSMNT}/.read.log | tar -xpv -C ${FSMNT} ${TAROPTS} -f - 2>&1 | tee -a ${FSMNT}/.extract.log
          if [ "$?" != "0" ]
@@ -61,6 +64,16 @@
 
 };
 
+
+# Function which will attempt to fetch the install file before we start
+# the install
+fetch_install_file()
+{
+
+
+};
+
+
 # Entrance function, which starts the installation process
 init_extraction()
 {

Modified: pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh	2009-11-04 17:58:14 UTC (rev 4868)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-localize.sh	2009-11-04 18:18:21 UTC (rev 4869)
@@ -105,105 +105,139 @@
    af) COUNTRY="C"
        SETLANG="af"
        LOCALE="af_ZA"
+       ;;
    ar) COUNTRY="C"
        SETLANG="ar"
        LOCALE="en_US"
+       ;;
    az) COUNTRY="C"
        SETLANG="az"
        LOCALE="en_US"
+       ;;
    ca) COUNTRY="es"
        SETLANG="es:ca"
        LOCALE="ca_ES"
+       ;;
    be) COUNTRY="be"
        SETLANG="be"
-       LOCALE="be_BY" ;;
+       LOCALE="be_BY"
+       ;;
    bn) COUNTRY="bn"
        SETLANG="bn"
        LOCALE="en_US"
+       ;;
    bg) COUNTRY="bg"
        SETLANG="bg"
        LOCALE="bg_BG"
+       ;;
    da) COUNTRY="dk"
        SETLANG="da"
        LOCALE="da_DK"
+       ;;
    de) COUNTRY="de"
        SETLANG="de"
        LOCALE="de_DE"
+       ;;
    en_GB) COUNTRY="gb"
        SETLANG="en_GB:cy"
        LOCALE="en_GB"
+       ;;
    el) COUNTRY="gr"
        SETLANG="el:gr"
        LOCALE="el_GR"
+       ;;
    es) COUNTRY="es"
        SETLANG="es"
        LOCALE="es_ES"
+       ;;
    es_LA) COUNTRY="us"
           SETLANG="es:en_US"
           LOCALE="es_ES"
+       ;;
    et) COUNTRY="ee"
        SETLANG="et"
        LOCALE="et_EE"
+       ;;
    fr) COUNTRY="fr"
        SETLANG="fr"
        LOCALE="fr_FR"
+       ;;
    he) COUNTRY="il"
        SETLANG="he:ar"
        LOCALE="he_IL"
+       ;;
    hr) COUNTRY="hr"
        SETLANG="hr"
        LOCALE="hr_HR"
+       ;;
    hu) COUNTRY="hu"
        SETLANG="hu"
        LOCALE="hu_HU"
+       ;;
    it) COUNTRY="it"
        SETLANG="it"
        LOCALE="it_IT"
+       ;;
    ja) COUNTRY="jp"
        SETLANG="ja"
        LOCALE="ja_JP"
+       ;;
    ko) COUNTRY="kr"
        SETLANG="ko"
        LOCALE="ko_KR"
+       ;;
    nl) COUNTRY="nl"
        SETLANG="nl"
        LOCALE="nl_NL"
+       ;;
    nn) COUNTRY="no"
        SETLANG="nn"
        LOCALE="en_US"
+       ;;
    pl) COUNTRY="pl"
        SETLANG="pl"
        LOCALE="pl_PL"
+       ;;
    pt) COUNTRY="pt"
        SETLANG="pt"
        LOCALE="pt_PT"
+       ;;
    pt_BR) COUNTRY="br"
           SETLANG="pt_BR"
           LOCALE="pt_BR"
+       ;;
    ru) COUNTRY="ru"
        SETLANG="ru"
        LOCALE="ru_RU"
+       ;;
    sk) COUNTRY="sk"
        SETLANG="sk"
        LOCALE="sk_SK"
+       ;;
    sv) COUNTRY="se"
        SETLANG="sv"
        LOCALE="sv_SE"
+       ;;
    uk) COUNTRY="ua"
        SETLANG="uk"
        LOCALE="uk_UA"
+       ;;
    vi) COUNTRY="vn"
        SETLANG="vi"
        LOCALE="en_US"
+       ;;
    zh_CN) COUNTRY="cn"
           SETLANG="zh_CN"
           LOCALE="zh_CN"
+       ;;
    zh_TW) COUNTRY="tw"
           SETLANG="zh_TW"
           LOCALE="zh_TW"
+       ;;
    *) COUNTRY="C"
       SETLANG="${LANG}"
       LOCALE="en_US"
+      ;;
   esac
 
  export COUNTRY SETLANG LOCALE

Modified: pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-11-04 17:58:14 UTC (rev 4868)
+++ pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-11-04 18:18:21 UTC (rev 4869)
@@ -44,8 +44,8 @@
 check_value installMode "fresh upgrade"
 check_value bootManager "bsd none"
 check_value installType "PCBSD FreeBSD"
-check_value installMedium "dvd usb ftp"
-check_value packageType "lzma uzip tar"
+check_value installMedium "dvd usb ftp rsync"
+check_value packageType "uzip tar"
 check_value partition "all s1 s2 s3 s4 free"
 if_check_value_exists mirrorbal "load prefer round-robin split"
 

Modified: pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg	2009-11-04 17:58:14 UTC (rev 4868)
+++ pcbsd/trunk/pc-sysinstall/conf/sample-install.cfg	2009-11-04 18:18:21 UTC (rev 4869)
@@ -49,18 +49,22 @@
 installMedium=dvd
 #installMedium=usb
 #installMedium=ftp
+#installMedium=rsync
 #ftpPath=ftp://ftp.pcbsd.org/test
+#rsyncPath=kris at 192.168.0.50
 
-# Set the type of system we are installing, PC-BSD* or FreeBSD
+# Set the type of system we are installing, PCBSD or FreeBSD
 installType=PCBSD
 #installType=FreeBSD
 
+# The installer archive, if not using the defaults in conf
+#installFile=fbsd-release.tbz
+
 # Set the optional components to install
 # The specified names need to match directory in components/
 installComponents=amarok,firefox,ports
 
 # The types of files we can install
-packageType=lzma
 #packageType=tar
 #packageType=uzip
 

Modified: pcbsd/trunk/pc-sysinstall/pcinstall.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-11-04 17:58:14 UTC (rev 4868)
+++ pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-11-04 18:18:21 UTC (rev 4869)
@@ -37,8 +37,10 @@
 # Set if we are installing via optical, USB, or FTP
 installType=PCBSD
 installMedium=dvd
+#installMedium=ftp
 
-#packageType=lzma
+ftpPath=ftp://192.168.0.2/netinstall
+
 packageType=uzip
 #packageType=tar
 #installComponents=ports,src
@@ -58,7 +60,6 @@
 userGroups=wheel,operator
 commitUser
 
-
 # Options for localizing an install
 localizeLang="ru"
 localizeKeyLayout="ru"



More information about the Commits mailing list