aboutsummaryrefslogtreecommitdiff
path: root/release/i386
diff options
context:
space:
mode:
authorGlen Barber <gjb@FreeBSD.org>2014-04-25 01:38:57 +0000
committerGlen Barber <gjb@FreeBSD.org>2014-04-25 01:38:57 +0000
commit6dceb683a7a3e1a5fba2069f9852b683dfc2a9f2 (patch)
tree99107c7fd86d16a3d3f4e2d1dc06cb3e268cacd1 /release/i386
parentf3b04ec6299f2c74922ed48a8e5adbd27d7fc560 (diff)
downloadsrc-6dceb683a7a3e1a5fba2069f9852b683dfc2a9f2.tar.gz
src-6dceb683a7a3e1a5fba2069f9852b683dfc2a9f2.zip
Refactor make-memstick.sh to avoid creating the 'dangerously
dedicated' partition scheme, reported to cause the memstick.img to fail to boot. Similar to how make-memstick.sh worked on stable/8, use makefs(8) to create the actual filesystem. Then calculate the size of the resulting image file, create the GPT partition scheme, then dd(1) the filesystem created with makefs(8) to the freebsd-ufs GPT partition. This was tested on a known-working machine[1] for regression, and a known-not-working machine[2] to ensure the boot issue has been resolved. Testers: myself [1], db [2] MFC After: 1 week Sponsored by: The FreeBSD Foundation
Notes
Notes: svn path=/head/; revision=264907
Diffstat (limited to 'release/i386')
-rwxr-xr-xrelease/i386/make-memstick.sh57
1 files changed, 51 insertions, 6 deletions
diff --git a/release/i386/make-memstick.sh b/release/i386/make-memstick.sh
index 2acecb5ee4be..a2a4570fd342 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 (full filesystem most likely but ...).
+# problem can be diagnosed.
#
# Usage: make-memstick.sh <directory tree> <image filename>
#
@@ -13,11 +13,15 @@
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
fi
+tempfile="${2}.$$"
+
if [ ! -d ${1} ]; then
echo "${1} must be a directory"
exit 1
@@ -28,21 +32,62 @@ if [ -e ${2} ]; then
exit 1
fi
-echo '/dev/ufs/FreeBSD_Install / ufs ro,noatime 1 1' > ${1}/etc/fstab
-makefs -B little -o label=FreeBSD_Install ${2} ${1}
+rm -f ${tempfile}
+echo "/dev/gpt/rootfs / ufs ro,noatime 1 1" > ${1}/etc/fstab
+makefs ${tempfile} ${1}
if [ $? -ne 0 ]; then
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 BSD ${unit}
-gpart bootcode -b ${1}/boot/boot ${unit}
-gpart add -t freebsd-ufs ${unit}
+
+gpart create -s gpt /dev/${unit}
+if [ $? -ne 0 ]; then
+ echo "GPT creation 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
+
mdconfig -d -u ${unit}
+rm -f ${tempfile}