Revert r264907 and r264908:

Restore make-memstick.sh back to its original state to
unbreak booting for machines that do not support GPT.

I have in-progress work to keep the MBR layout and add
the EFI partition, but it is not yet ready, and does
need at least one full release build to be certain it
does not break.

Sponsored by:	The FreeBSD Foundation

2 files changed, 32 insertions, 122 deletions

diff --git a/release/amd64/make-memstick.sh b/release/amd64/make-memstick.sh
index 4c7dcdd16a60..2acecb5ee4be 100755
--- a/release/amd64/make-memstick.sh
+++ b/release/amd64/make-memstick.sh
@@ -3,7 +3,7 @@
 # This script generates a "memstick image" (image that can be copied to a
 # USB memory stick) from a directory tree.  Note that the script does not
 # clean up after itself very well for error conditions on purpose so the
-# problem can be diagnosed.
+# problem can be diagnosed (full filesystem most likely but ...).
 #
 # Usage: make-memstick.sh <directory tree> <image filename>
 #
@@ -13,81 +13,36 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export PATH
 
-BLOCKSIZE=10240
-
 if [ $# -ne 2 ]; then
-	echo "make-memstick.sh /path/to/directory /path/to/image/file"
-	exit 1
+  echo "make-memstick.sh /path/to/directory /path/to/image/file"
+  exit 1
 fi
 
-tempfile="${2}.$$"
-
 if [ ! -d ${1} ]; then
-	echo "${1} must be a directory"
-	exit 1
+  echo "${1} must be a directory"
+  exit 1
 fi
 
 if [ -e ${2} ]; then
-	echo "won't overwrite ${2}"
-	exit 1
+  echo "won't overwrite ${2}"
+  exit 1
 fi
 
-rm -f ${tempfile}
-echo "/dev/gpt/rootfs / ufs ro,noatime 1 1" > ${1}/etc/fstab
-makefs ${tempfile} ${1}
+echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
+makefs -B little -o label=FreeBSD_Install ${2} ${1}
 if [ $? -ne 0 ]; then
-	echo "makefs failed"
-	exit 1
+  echo "makefs failed"
+  exit 1
 fi
 rm ${1}/etc/fstab
 
-#
-# Use $BLOCKSIZE for transfers to improve efficiency.  When calculating
-# how many blocks to transfer "+ 520" is to account for truncation in the
-# division and to provide ample padding.
-#
-
-filesize=$(stat -f "%z" ${tempfile})
-blocks=$(( ${filesize} / ${BLOCKSIZE} + 520 ))
-dd if=/dev/zero of=${2} bs=${BLOCKSIZE} count=${blocks}
-if [ $? -ne 0 ]; then
-	echo "creation of image file failed"
-	exit 1
-fi
-
 unit=`mdconfig -a -t vnode -f ${2}`
 if [ $? -ne 0 ]; then
-	echo "mdconfig failed"
-	exit 1
-fi
-
-gpart create -s gpt /dev/${unit}
-if [ $? -ne 0 ]; then
-	echo "GPT creation failed"
-	exit 1
+  echo "mdconfig failed"
+  exit 1
 fi
-gpart add -t freebsd-boot -s 512k /dev/${unit}
-if [ $? -ne 0 ]; then
-	echo "Creating boot partition failed"
-	exit 1
-fi
-gpart bootcode -b ${1}/boot/pmbr -p ${1}/boot/gptboot -i 1 /dev/${unit}
-if [ $? -ne 0 ]; then
-	echo "Writing bootcode failed"
-	exit 1
-fi
-gpart add -t freebsd-ufs -l rootfs /dev/${unit}
-if [ $? -ne 0 ]; then
-	echo "Creating UFS partition failed"
-	exit 1
-fi
-
-dd if=${tempfile} of=/dev/${unit}p2 bs=$BLOCKSIZE conv=sync
-if [ $? -ne 0 ]; then
-	echo "copying filesystem into image file 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}
 
-rm -f ${tempfile}
diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh
index 4c7dcdd16a60..2acecb5ee4be 100755
--- a/release/i386/make-memstick.sh
+++ b/release/i386/make-memstick.sh
@@ -3,7 +3,7 @@
 # This script generates a "memstick image" (image that can be copied to a
 # USB memory stick) from a directory tree.  Note that the script does not
 # clean up after itself very well for error conditions on purpose so the
-# problem can be diagnosed.
+# problem can be diagnosed (full filesystem most likely but ...).
 #
 # Usage: make-memstick.sh <directory tree> <image filename>
 #
@@ -13,81 +13,36 @@
 PATH=/bin:/usr/bin:/sbin:/usr/sbin
 export PATH
 
-BLOCKSIZE=10240
-
 if [ $# -ne 2 ]; then
-	echo "make-memstick.sh /path/to/directory /path/to/image/file"
-	exit 1
+  echo "make-memstick.sh /path/to/directory /path/to/image/file"
+  exit 1
 fi
 
-tempfile="${2}.$$"
-
 if [ ! -d ${1} ]; then
-	echo "${1} must be a directory"
-	exit 1
+  echo "${1} must be a directory"
+  exit 1
 fi
 
 if [ -e ${2} ]; then
-	echo "won't overwrite ${2}"
-	exit 1
+  echo "won't overwrite ${2}"
+  exit 1
 fi
 
-rm -f ${tempfile}
-echo "/dev/gpt/rootfs / ufs ro,noatime 1 1" > ${1}/etc/fstab
-makefs ${tempfile} ${1}
+echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
+makefs -B little -o label=FreeBSD_Install ${2} ${1}
 if [ $? -ne 0 ]; then
-	echo "makefs failed"
-	exit 1
+  echo "makefs failed"
+  exit 1
 fi
 rm ${1}/etc/fstab
 
-#
-# Use $BLOCKSIZE for transfers to improve efficiency.  When calculating
-# how many blocks to transfer "+ 520" is to account for truncation in the
-# division and to provide ample padding.
-#
-
-filesize=$(stat -f "%z" ${tempfile})
-blocks=$(( ${filesize} / ${BLOCKSIZE} + 520 ))
-dd if=/dev/zero of=${2} bs=${BLOCKSIZE} count=${blocks}
-if [ $? -ne 0 ]; then
-	echo "creation of image file failed"
-	exit 1
-fi
-
 unit=`mdconfig -a -t vnode -f ${2}`
 if [ $? -ne 0 ]; then
-	echo "mdconfig failed"
-	exit 1
-fi
-
-gpart create -s gpt /dev/${unit}
-if [ $? -ne 0 ]; then
-	echo "GPT creation failed"
-	exit 1
+  echo "mdconfig failed"
+  exit 1
 fi
-gpart add -t freebsd-boot -s 512k /dev/${unit}
-if [ $? -ne 0 ]; then
-	echo "Creating boot partition failed"
-	exit 1
-fi
-gpart bootcode -b ${1}/boot/pmbr -p ${1}/boot/gptboot -i 1 /dev/${unit}
-if [ $? -ne 0 ]; then
-	echo "Writing bootcode failed"
-	exit 1
-fi
-gpart add -t freebsd-ufs -l rootfs /dev/${unit}
-if [ $? -ne 0 ]; then
-	echo "Creating UFS partition failed"
-	exit 1
-fi
-
-dd if=${tempfile} of=/dev/${unit}p2 bs=$BLOCKSIZE conv=sync
-if [ $? -ne 0 ]; then
-	echo "copying filesystem into image file 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}
 
-rm -f ${tempfile}