[PC-BSD Commits] r5172 - pcbsd/trunk/pc-sysinstall/backend

[svn at pcbsd.org]

Author: kris
Date: 2009-12-01 06:56:02 -0800 (Tue, 01 Dec 2009)
New Revision: 5172

Modified:
   pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh
   pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh
Log:

Updated pc-sysinstall to support uppercase "all" and "free" in partition cfg



Modified: pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh	2009-12-01 14:19:13 UTC (rev 5171)
+++ pcbsd/trunk/pc-sysinstall/backend/functions-disk.sh	2009-12-01 14:56:02 UTC (rev 5172)
@@ -115,7 +115,7 @@
        PTYPE="$VAL"
 
        # We are using free space, figure out the slice number
-       if [ "${PTYPE}" = "free" ]
+       if [ "${PTYPE}" = "free" -o "${PTYPE}" = "FREE" ]
        then
          # Lets figure out what number this slice will be
          LASTSLICE="`fdisk -s /dev/${DISK} | grep -v ${DISK} | grep ':' | tail -n 1 | cut -d ':' -f 1 | tr -s '\t' ' ' | tr -d ' '`"
@@ -150,11 +150,11 @@
        if [ ! -z "${DISK}" -a ! -z "${PTYPE}" ]
        then
          case ${PTYPE} in
-                   all) tmpSLICE="${DISK}s1"  
+                   all|ALL) tmpSLICE="${DISK}s1"  
                         run_fdisk_full "${DISK}" "${BMANAGER}" ;;
            s1|s2|s3|s4) tmpSLICE="${DISK}${PTYPE}" 
                         run_fdisk_slice "${DISK}" "${BMANAGER}" "${PTYPE}" ;;
-                  free) tmpSLICE="${DISK}s${LASTSLICE}"
+                 free|FREE) tmpSLICE="${DISK}s${LASTSLICE}"
                         run_fdisk_free "${DISK}" "${LASTSLICE}" "${BMANAGER}" ;;
                      *) exit_err "ERROR: Unknown PTYPE: $PTYPE" ;;
          esac

Modified: pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh
===================================================================
--- pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-12-01 14:19:13 UTC (rev 5171)
+++ pcbsd/trunk/pc-sysinstall/backend/parseconfig.sh	2009-12-01 14:56:02 UTC (rev 5172)
@@ -46,7 +46,7 @@
 check_value installType "PCBSD FreeBSD"
 check_value installMedium "dvd usb ftp rsync"
 check_value packageType "uzip tar"
-check_value partition "all s1 s2 s3 s4 free"
+check_value partition "all ALL s1 s2 s3 s4 free FREE"
 if_check_value_exists mirrorbal "load prefer round-robin split"
 
 # We passed all sanity checks! Yay, lets start the install