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

[svn at pcbsd.org]

Author: kris
Date: 2012-10-03 12:46:34 +0000 (Wed, 03 Oct 2012)
New Revision: 19586

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

Fix a bug setting the dist directory before extraction

Also add new options to examples/README



Modified: pcbsd/current/build-files/src-patches/patch-pc-sysinstall-distfiles
===================================================================
--- pcbsd/current/build-files/src-patches/patch-pc-sysinstall-distfiles	2012-10-03 09:20:06 UTC (rev 19585)
+++ pcbsd/current/build-files/src-patches/patch-pc-sysinstall-distfiles	2012-10-03 12:46:34 UTC (rev 19586)
@@ -22,9 +22,9 @@
 +# Performs the extraction of data to disk from FreeBSD dist files
 +start_extract_dist()
 +{
-+  if [ -z "$INSFILE" ]; then
-+    exit_err "ERROR: Called extraction with no install file set!"
-+  fi
++  if [ -z "$1" ] ; then exit_err "Called dist extraction with no directory set!"; fi
++  if [ -z "$INSFILE" ]; then exit_err "Called extraction with no install file set!"; fi
++  local DDIR="$1"
 +
 +  # Check if we are doing an upgrade, and if so use our exclude list
 +  if [ "${INSTALLMODE}" = "upgrade" ]; then
@@ -37,14 +37,14 @@
 +  for di in $INSFILE
 +  do
 +      # Check the MANIFEST see if we have an archive size / count
-+      if [ -e "${DLDIR}/MANIFEST" ]; then 
-+         count=`grep "^${di}.txz" ${DLDIR}/MANIFEST | awk '{print $3}'`
++      if [ -e "${DDIR}/MANIFEST" ]; then 
++         count=`grep "^${di}.txz" ${DDIR}/MANIFEST | awk '{print $3}'`
 +	 if [ ! -z "$count" ] ; then
 +            echo "INSTALLCOUNT: $count"
 +	 fi
 +      fi
 +      echo_log "pc-sysinstall: Starting Extraction (${di})"
-+      tar -xpv -C ${FSMNT} -f ${DLDIR}/${di}.txz ${TAROPTS} >&1 2>&1
++      tar -xpv -C ${FSMNT} -f ${DDIR}/${di}.txz ${TAROPTS} >&1 2>&1
 +      if [ $? -ne 0 ]; then
 +        exit_err "ERROR: Failed extracting the dist file: $di"
 +      fi
@@ -53,7 +53,7 @@
 +  # Check if this was a FTP download and clean it up now
 +  if [ "${INSTALLMEDIUM}" = "ftp" ]; then
 +    echo_log "Cleaning up downloaded archives"
-+    rm -rf ${DLDIR}
++    rm -rf ${DDIR}
 +  fi
 +
 +  echo_log "pc-sysinstall: Extraction Finished"
@@ -168,7 +168,7 @@
 -        INSFILE="${CDMNT}/${INSFILE}" ; export INSFILE
 -        start_extract_uzip_tar
 +	if [ "$PACKAGETYPE" = "dist" ] ; then
-+          start_extract_dist "$CDMNT/usr/fbsd-dist"
++          start_extract_dist "${CDMNT}/usr/freebsd-dist"
 +	else
 +          INSFILE="${CDMNT}/${INSFILE}" ; export INSFILE
 +          start_extract_uzip_tar
@@ -221,3 +221,40 @@
        ;;
      *) exit_err "ERROR: Unknown install medium" ;;
    esac
+Index: usr.sbin/pc-sysinstall/examples/README
+===================================================================
+--- usr.sbin/pc-sysinstall/examples/README	(revision 241143)
++++ usr.sbin/pc-sysinstall/examples/README	(working copy)
+@@ -243,11 +243,16 @@
+ 
+ Available Types:
+   dvd - Search for and mount the DVD which contains the install archive
++local - Pull files directly from a local directory
+   usb - Search for and mount the USB drive which contains the install archive
+   ftp - The install archive will be fetched from a FTP / HTTP server before install
+ rsync - Pull the system data from a ssh + rsync server, specified with variables below
+ image - Install system from an image
+ 
++# localPath=/usr/freebsd-dist
++
++Location of the directory we will be pulling installation files from
++
+ # installType=(PCBSD, FreeBSD)
+ 
+ Set the type of system we are installing, PCBSD or FreeBSD
+@@ -256,10 +261,14 @@
+ 
+ The installer archive, if not using the defaults specified in conf/pc-sysinstall.conf
+ 
+-# packageType=(tar, uzip, split)
++# packageType=(tar, uzip, split, dist)
+ 
+ The archive type we are extracting from when using dvd, usb or ftp
+ 
++# distFiles=base src kernel
++
++List of dist files to install when packageType=dist
++
+ # ftpPath=ftp://ftp.pcbsd.org/pub/8.0/netinstall
+ 
+ Location of the installer archive when using a installMedium=ftp