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

[svn at pcbsd.org]

Author: kris
Date: 2009-11-04 08:44:16 -0800 (Wed, 04 Nov 2009)
New Revision: 4864

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

Added support to pc-sysinstall to enable networking before doing an install



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-11-04 15:38:39 UTC (rev 4863)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-extractimage.sh	2009-11-04 16:44:16 UTC (rev 4864)
@@ -40,7 +40,7 @@
          cd ${FSMNT}.uzip
 
          # Copy over all the files now!
-         tar cvf - . 2>/dev/null | tar -xpv -C ${FSMNT} ${TAROPTS} -f - >&1 2>&1
+         tar cvf - . 2>>${FSMNT}/.read.log | tar -xpv -C ${FSMNT} ${TAROPTS} -f - 2>&1 | tee -a ${FSMNT}/.extract.log
          if [ "$?" != "0" ]
          then
            exit_err "ERROR: Failed extracting the tar image"

Modified: pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-11-04 15:38:39 UTC (rev 4863)
+++ pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-11-04 16:44:16 UTC (rev 4864)
@@ -11,6 +11,7 @@
 . ${BACKEND}/functions-installcomponents.sh
 . ${BACKEND}/functions-localize.sh
 . ${BACKEND}/functions-mountdisk.sh
+. ${BACKEND}/functions-networking.sh
 . ${BACKEND}/functions-newfs.sh
 . ${BACKEND}/functions-parse.sh
 . ${BACKEND}/functions-runcommands.sh
@@ -64,9 +65,13 @@
 get_value_from_cfg packageType
 PACKAGETYPE="${VAL}" ; export PACKAGETYPE
 
+# Check if we are doing any networking setup
+start_networking
+
 # If we are not doing an upgrade, lets go ahead and setup the disk
 if [ "${INSTALLMODE}" = "fresh" ]
 then
+
   # Lets start setting up the disk slices now
   setup_disk_slice
   

Modified: pcbsd/trunk/pc-sysinstall/pcinstall.cfg
===================================================================
--- pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-11-04 15:38:39 UTC (rev 4863)
+++ pcbsd/trunk/pc-sysinstall/pcinstall.cfg	2009-11-04 16:44:16 UTC (rev 4864)
@@ -20,6 +20,12 @@
 # Do it now!
 commitDiskLabel
 
+netDev=AUTO-DHCP
+#netDev=nfe0
+#netIP=192.168.0.49
+#netNameServer=208.67.222.222
+#netDefaultRouter=192.168.0.1
+#netMask=255.255.255.0
 
 # Set if we are installing via optical, USB, or FTP
 installType=PCBSD