svn commit: r283548 - stable/10/release/i386

[Glen Barber]

Author: gjb
Date: Tue May 26 00:44:29 2015
New Revision: 283548
URL: https://svnweb.freebsd.org/changeset/base/283548

Log:
  MFC r283307:
   Use mkimg(1) to create the i386 memstick images, similar to
   how is done for amd64.  The exception here is there is no
   EFI partition for i386.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/10/release/i386/make-memstick.sh
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/i386/make-memstick.sh
==============================================================================
--- stable/10/release/i386/make-memstick.sh	Mon May 25 23:27:13 2015	(r283547)
+++ stable/10/release/i386/make-memstick.sh	Tue May 26 00:44:29 2015	(r283548)
@@ -29,20 +29,13 @@ if [ -e ${2} ]; then
 fi
 
 echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
-makefs -B little -o label=FreeBSD_Install ${2} ${1}
+makefs -B little -o label=FreeBSD_Install ${2}.part ${1}
 if [ $? -ne 0 ]; then
 	echo "makefs failed"
 	exit 1
 fi
 rm ${1}/etc/fstab
 
-unit=$(mdconfig -a -t vnode -f ${2})
-if [ $? -ne 0 ]; then
-	echo "mdconfig failed"
-	exit 1
-fi
-gpart create -s BSD ${unit}
-gpart bootcode -b ${1}/boot/boot ${unit}
-gpart add -t freebsd-ufs ${unit}
-mdconfig -d -u ${unit}
+mkimg -s gpt -b ${1}/boot/pmbr -p freebsd-boot:=${1}/boot/gptboot -p freebsd-ufs:=${2}.part -p freebsd-swap::1M -o ${2}
+rm ${2}.part