svn commit: r214188 - head/usr.sbin/pc-sysinstall/backend

[Warner Losh]

Author: imp
Date: Thu Oct 21 22:46:10 2010
New Revision: 214188
URL: http://svn.freebsd.org/changeset/base/214188

Log:
  More support for IMAGE installations

Modified:
  head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh

Modified: head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh
==============================================================================
--- head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	Thu Oct 21 22:33:50 2010	(r214187)
+++ head/usr.sbin/pc-sysinstall/backend/functions-bsdlabel.sh	Thu Oct 21 22:46:10 2010	(r214188)
@@ -219,9 +219,17 @@ setup_mbr_partitions()
         USINGENCROOT="0" ; export USINGENCROOT
       fi
           
+      if [ -n "${IMAGE}" ]
+      then
+        FS="IMAGE"
+        SIZE=`ls -l "${IMAGE}" | awk '{ print $5 }'`
+        MNT=`echo $STRING | tr -s '\t' ' ' | cut -d ' ' -f 2`
+		SIZE=`convert_byte_to_megabyte $SIZE`
+      fi
+
       # Now check that these values are sane
       case $FS in
-        UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP) ;;
+        UFS|UFS+S|UFS+J|UFS+SUJ|ZFS|SWAP|IMAGE) ;;
        *) exit_err "ERROR: Invalid file system specified on $line" ;;
       esac