[PC-BSD Commits] r19828 - pcbsd/current/build-files/src-patches

[svn at pcbsd.org]

Author: kris
Date: 2012-10-20 21:14:34 +0000 (Sat, 20 Oct 2012)
New Revision: 19828

Modified:
   pcbsd/current/build-files/src-patches/patch-pc-sysinstall-distfiles
Log:

Update the distfiles patch, fix a few bugs, should work now with fetching and
installing via FreeBSD distfiles



Modified: pcbsd/current/build-files/src-patches/patch-pc-sysinstall-distfiles
===================================================================
--- pcbsd/current/build-files/src-patches/patch-pc-sysinstall-distfiles	2012-10-20 09:19:42 UTC (rev 19827)
+++ pcbsd/current/build-files/src-patches/patch-pc-sysinstall-distfiles	2012-10-20 21:14:34 UTC (rev 19828)
@@ -1,19 +1,6 @@
-Index: usr.sbin/pc-sysinstall/backend/parseconfig.sh
-===================================================================
---- usr.sbin/pc-sysinstall/backend/parseconfig.sh	(revision 241143)
-+++ usr.sbin/pc-sysinstall/backend/parseconfig.sh	(working copy)
-@@ -69,7 +69,7 @@
- check_value installMode "fresh upgrade extract"
- check_value installType "PCBSD FreeBSD"
- check_value installMedium "dvd usb ftp rsync image local"
--check_value packageType "uzip tar rsync split"
-+check_value packageType "uzip tar rsync split dist"
- if_check_value_exists mirrorbal "load prefer round-robin split"
- 
- # We passed all sanity checks! Yay, lets start the install
 Index: usr.sbin/pc-sysinstall/backend/functions-extractimage.sh
 ===================================================================
---- usr.sbin/pc-sysinstall/backend/functions-extractimage.sh	(revision 241143)
+--- usr.sbin/pc-sysinstall/backend/functions-extractimage.sh	(revision 241789)
 +++ usr.sbin/pc-sysinstall/backend/functions-extractimage.sh	(working copy)
 @@ -29,23 +29,60 @@
  
@@ -138,7 +125,7 @@
          uzip) INSFILE="${FBSD_UZIP_FILE}" ;;
          tar) INSFILE="${FBSD_TAR_FILE}" ;;
 +        dist) 
-+	  get_value_from_cfg distFiles
++	  get_value_from_cfg_with_spaces distFiles
 +	  if [ -z "$VAL" ] ; then
 +	     exit_err "No dist files specified!"
 +	  fi
@@ -152,7 +139,7 @@
          uzip) INSFILE="${UZIP_FILE}" ;;
          tar) INSFILE="${TAR_FILE}" ;;
 +        dist) 
-+	  get_value_from_cfg distFiles
++	  get_value_from_cfg_with_spaces distFiles
 +	  if [ -z "$VAL" ] ; then
 +	     exit_err "No dist files specified!"
 +	  fi
@@ -221,9 +208,35 @@
        ;;
      *) exit_err "ERROR: Unknown install medium" ;;
    esac
+Index: usr.sbin/pc-sysinstall/backend/functions-parse.sh
+===================================================================
+--- usr.sbin/pc-sysinstall/backend/functions-parse.sh	(revision 241789)
++++ usr.sbin/pc-sysinstall/backend/functions-parse.sh	(working copy)
+@@ -45,7 +45,7 @@
+ {
+   if [ -n "${1}" ]
+   then
+-    export VAL=`grep "^${1}=" ${CFGF} | head -n 1 | cut -d '=' -f 2-`
++    export VAL="`grep ^${1}= ${CFGF} | head -n 1 | cut -d '=' -f 2-`"
+   else
+     exit_err "Error: Did we forgot to supply a setting to grab?"
+   fi
+Index: usr.sbin/pc-sysinstall/backend/parseconfig.sh
+===================================================================
+--- usr.sbin/pc-sysinstall/backend/parseconfig.sh	(revision 241789)
++++ usr.sbin/pc-sysinstall/backend/parseconfig.sh	(working copy)
+@@ -69,7 +69,7 @@
+ check_value installMode "fresh upgrade extract"
+ check_value installType "PCBSD FreeBSD"
+ check_value installMedium "dvd usb ftp rsync image local"
+-check_value packageType "uzip tar rsync split"
++check_value packageType "uzip tar rsync split dist"
+ if_check_value_exists mirrorbal "load prefer round-robin split"
+ 
+ # We passed all sanity checks! Yay, lets start the install
 Index: usr.sbin/pc-sysinstall/examples/README
 ===================================================================
---- usr.sbin/pc-sysinstall/examples/README	(revision 241143)
+--- usr.sbin/pc-sysinstall/examples/README	(revision 241789)
 +++ usr.sbin/pc-sysinstall/examples/README	(working copy)
 @@ -243,11 +243,16 @@