 @@ -1,274 +1,280 @@
 #!/bin/sh
-# $NetBSD: mkimage,v 1.68 2017/11/28 00:24:08 kre Exp $
+# $NetBSD: mkimage,v 1.69 2017/11/28 02:56:44 kre Exp $
+#
 # Copyright (c) 2013, 2014 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # This code is derived from software contributed to The NetBSD Foundation
 # by Christos Zoulas.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
 # 3. Neither the name of The NetBSD Foundation nor the names of its
 #    contributors may be used to endorse or promote products derived
 #    from this software without specific prior written permission.
+#
 # THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
 # ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
 # TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
 # PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
 # BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
 # CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
 # SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
 # INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
 # CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
 # ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
 # POSSIBILITY OF SUCH DAMAGE.
+#
+#
 # Makes a bootable image for the host architecture given.
 # The host specific functions are pulled in from a /bin/sh script in the
 # "conf" directory, and is expected to provide the following shell
 # functions, which are called in the following order:
+#
 #  - make_fstab: Creates the host's /etc/fstab with / on ${rootdev}.
 #    If -m is given, a number of directories are put on a tmpfs RAM disk
 #  - customize: After unpacking the sets, this gets the system to
 #    a working state, e. g. by setting up /etc/rc.conf and /dev
 #  - populate: Add common goods like kernel and bootloader
 #  - make_label: Prints disklabel to stdout
+#
 set -e
 DIR="$(cd "$(dirname "$0")" && pwd)"
 PROG="$(basename "$0")"
 MAKE=${TOOL_MAKE:-make}
 DISKLABEL=${TOOL_DISKLABEL:-disklabel}
 FDISK=${TOOL_FDISK:-fdisk}
 MAKEFS=${TOOL_MAKEFS:-makefs}
 MTREE=${TOOL_MTREE:-mtree}
 INSTALLBOOT=${TOOL_INSTALLBOOT:-installboot}
 MKUBOOTIMAGE=${TOOL_MKUBOOTIMAGE:-mkubootimage}
 GZIP_CMD=${TOOL_GZIP:-gzip} # ${GZIP} is special to gzip(1)
 src="/usr/src"
 sets="base comp etc games man misc modules tests text"
 xsets="xbase xcomp xetc xfont xserver"
 minfree="10%"
 bar="==="
 tmp="$(mktemp -d "${TMPDIR:-/tmp}/$PROG.XXXXXX")"
 mnt="${tmp}/mnt"
 mkdir -p "${mnt}/etc" "${mnt}/dev"
 trap "cleanup" 0 1 2 3 15
 cleanup() {
 	case "$tmp" in
 	"${TMPDIR:-/tmp}/$PROG."*)	rm -fr "$tmp";;
 	esac
+}
 fail() {
 	IFS=' '
 	echo >&2 "${PROG}: $*"
 	exit 1
+}
 getsize() {
 	set -- $(ls -l $1)
 	echo $5
+}
 getsectors() {
 	case "$1" in
 	*g)
 		m=1073741824
 		v=${1%g}
 		;;
 	*m)
 		m=1048576
 		v=${1%m}
 		;;
 	*k)
 		m=1024
 		v=${1%k}
 		;;
 	*[0-9b])
 		m=1
 		v=${1%b}
 		;;
 	esac
 	echo $((m * v / 512))
+}
 usage() {
 	cat << EOF 1>&2
 Usage: $PROG -h <host-arch> [-bdmx] [-B <byte-order>] [-K <kerneldir>] [-S <srcdir>] [-D <destdir>] [-c <custom-files-dir>] [-s <Mb size>] [<image>]
 -b	Boot only, no sets loaded
 -r	root device kind (sd, wd, ld)
 -d	Add the debug sets
 -m	Optimize the OS installation to mimimize disk writes for SSDs
 -x	Load the X sets too, not just the base ones
 EOF
 	exit 1
+}
 # First pass for options to get the host and src directories
 OPTS="B:D:K:S:bc:dh:mr:s:x"
 while getopts "$OPTS" f
 do
 	case $f in
 	h)	h="$OPTARG";;
 	S)	src="$OPTARG";;
 	*)	;;
 	esac
 done
 if [ -z "$h" ]
 then
 	usage
 fi
 if [ ! -f "${DIR}/conf/${h}.conf" ]
 then
 	echo $PROG: ${DIR}/conf/${h}.conf is not present 1>&2
 	exit 1
 fi
 resize=false
 . "${DIR}/conf/${h}.conf"
 release="/usr/obj/${MACHINE}/release"
 selected_sets="$sets"
 dsets_p=false
 xsets_p=false
 minwrites=false
 rootdev=ld
 endian=
 OPTIND=1
 while getopts "$OPTS" f
 do
 	case $f in
 	B)	endian="-B $OPTARG";;
 	D)	release="$OPTARG";;
 	K)	kernel="$OPTARG";;
 	S)	;;
 	b)	bootonly=true;;
 	d)	dsets_p=true
 		selected_sets="$selected_sets debug"
 		if $xsets_p; then
 			selected_sets="$selected_sets xdebug"
 		fi
 		;;
 	c)	custom="$OPTARG";;
 	h)	;;
 	m)	minwrites=true;;
 	r)	rootdev="$OPTARG";;
 	s)	size="$OPTARG";;
 	x)	xsets_p=true
 		selected_sets="$selected_sets $xsets"
 		if $dsets_p; then
 		    selected_sets="$selected_sets xdebug"
 		fi
 		;;
 	*)	usage;;
 	esac
 done
 shift $(( $OPTIND - 1 ))
 if [ -n "$1" ]; then
 	# take the next argument as being the image name
 	image="$1"
 	shift
 fi
 case "$image" in
 *.gz)	compress=true; image="${image%.gz}";;
 *)	compress=false;;
 esac
 if [ -z "${bootonly}" ]; then
 	echo ${bar} configuring sets ${bar}
 	(cat "${release}/etc/mtree/NetBSD.dist"
 	for i in $selected_sets; do
 		s="${release}/etc/mtree/set.$i"
 		if [ -f "$s" ]; then
 			cat "$s"
 		fi
 	done) > "$tmp/selected_sets"
 fi
 make_fstab
 customize
 populate
 if [ -n "${msdosid}" ]; then
 	echo ${bar} Populating msdos filesystem ${bar}
 	${MAKEFS} -N ${release}/etc -t msdos -o volume_label=NETBSD \
 	    -O $((${init} / 2))m -s $((${boot} / 2))m \
 	    ${image} ${mnt}/boot
 fi
 if [ -z "${bootonly}" ]; then
 	echo ${bar} Populating ffs filesystem ${bar}
 	${MAKEFS} -rx ${endian} -N ${release}/etc -t ffs \
 	    -O ${ffsoffset} \
 	    -o d=4096,f=8192,b=65536 -b $((${extra}))m \
 	    -F "$tmp/selected_sets" ${image} "${release}" "${mnt}"
 fi
 if [ "${size}" = 0 ]; then
 	size="$(getsize "${image}")"
 fi
 newsize=$((${size} / 2 / 1024))
 compare=$((${newsize} * 2 * 1024))
 while [ "${compare}" != "${size}" ]
 do
 	size="$((size + size - compare))"
 	newsize="$((${size} / 2 / 1024))"
 	compare="$((${newsize} * 2 * 1024))"
 done
 if [ -n "${msdosid}" ]; then
 	echo ${bar} Running fdisk ${bar}
 	initsecs=$((${init} * 1024))
 	bootsecs=$((${boot} * 1024))
 	${FDISK} -f -i ${image}
 	${FDISK} -f -a -u -0 -s ${msdosid}/${initsecs}/${bootsecs} -F ${image}
 	if [ -z "${bootonly}" ]; then
 		ffsstart="$(getsectors ${ffsoffset})"
 		imagesize="$(getsize "${image}")"
 		imagesecs="$(getsectors ${imagesize})"
 		ffssize="$(expr ${imagesecs} - ${ffsstart})"
 		${FDISK} -f -u -1 -s 169/${ffsstart}/${ffssize} -F ${image}
 	fi
 	echo ${bar} Adding label ${bar}
 	make_label > ${tmp}/label
 	${DISKLABEL} -R -F ${image} ${tmp}/label
 elif [ -n "${netbsdid}" ]; then
 	echo ${bar} Adding label ${bar}
 	make_label > ${tmp}/label
 	${DISKLABEL} -R -F ${image} ${tmp}/label
 	echo ${bar} Running fdisk ${bar}
 	${FDISK} -f -i ${image}
 	${FDISK} -f -a -u -0 -s 169/${init} ${image}
 	${INSTALLBOOT} -f -v ${image} ${release}/usr/mdec/bootxx_ffsv1
 fi
 if $compress; then
 	echo ${bar} Compressing image ${bar}
 	rm -f "${image}.gz"
 	${GZIP_CMD} -9 ${image}
 	image="${image}.gz"
 fi
 echo ${bar} Image is ${image} ${bar}

 @@ -1,166 +1,167 @@
-# $NetBSD: armv7.conf,v 1.19 2017/11/09 21:36:46 skrll Exp $
+# $NetBSD: armv7.conf,v 1.20 2017/11/28 02:56:44 kre Exp $
 # ARMv7 customization script used by mkimage
+#
 board=armv7
 console=fb
 resize=true
 . ${DIR}/conf/evbarm.conf
 kernels_beagle="BEAGLEBOARD BEAGLEBONE"
 kernels_awin="BPI CUBIEBOARD CUBIETRUCK"
 kernels_rpi="RPI2"
 kernels_amlogic="ODROID-C1"
 kernels_tegra="TEGRA"
 kernels_sunxi="SUNXI"
 make_label() {
 	make_label_evbarm
+}
 make_fstab() {
 	make_fstab_evbarm
+}
 customize() {
 	customize_evbarm
 	cat >> "${mnt}/etc/rc.conf" << EOF
 mdnsd=YES
 wscons=YES
 devpubd=YES
 EOF
+}
 populate_common() {
 	# Install boot script
 	cp ${DIR}/files/armv7_boot.cmd ${mnt}/boot/boot.cmd
 	"${MKUBOOTIMAGE}" -A arm -C none -O netbsd -T script -a 0 -n "NetBSD/armv7 boot" "${mnt}/boot/boot.cmd" "${mnt}/boot/boot.scr"
+}
 populate_beagle() {
+	:
+}
 populate_awin() {
+	:
+}
 populate_rpi() {
 	firmwaredir="${src}/external/broadcom/rpi-firmware/dist"
 	firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 	# RPI2 kernel needs to be installed as kernel7.img
 	if [ -f "${mnt}/boot/netbsd-RPI2.bin" ]; then
 		echo "${bar} renaming netbsd-RPI2.bin to kernel7.img ${bar}"
 		mv "${mnt}/boot/netbsd-RPI2.bin" "${mnt}/boot/kernel7.img"
 		cat > "${mnt}/boot/cmdline.txt" << EOF
 root=ld0a console=${console}
 #fb=1280x1024		# to select a mode, otherwise try EDID
 #fb=disable		# to disable fb completely
 EOF
 		cat > ${mnt}/boot/config.txt << EOF
 # UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
 enable_uart=1
 force_turbo=0
 EOF
 	        echo "${bar} installing firmware files ${bar}"
 		(cd "${mnt}/boot" &&
 			for f in ${firmwarefiles}; do
 				echo " $f"
 				cp "${firmwaredir}/${f}" .
 			done
+        	)
 	fi
+	#
 	# If arm_freq is specified in config.txt, set CPU frequency
 	# to match at boot time.
+	#
 	cp ${release}/etc/rc.local ${mnt}/etc/rc.local
 	cat >> ${mnt}/etc/rc.local << EOF
 if /sbin/sysctl -q machdep.cpu.frequency.max; then
 	cpufreq_max=\$(/sbin/sysctl -n machdep.cpu.frequency.max)
 	cpufreq_cur=\$(/sbin/sysctl -n machdep.cpu.frequency.current)
 	if [ ! "\$cpufreq_max" = "\$cpufreq_cur" ]; then
 		/sbin/sysctl -w machdep.cpu.frequency.target=\$cpufreq_max
 	fi
 fi
 EOF
 	echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" \
 	    >> "$tmp/selected_sets"
+}
 populate_amlogic() {
 	odroidc1_kernelimg=netbsd-ODROID-C1.ub
 	# Create a boot.ini for Amlogic U-Boot
 	cat >> "${mnt}/boot/boot.ini" << EOF
 ODROIDC-UBOOT-CONFIG
 setenv bootargs "root=ld0a awge0.mac-address=\${ethaddr} console=${console}"
 setenv bootcmd "fatload mmc 0:1 0x21000000 ${odroidc1_kernelimg}; bootm 0x21000000"
 run bootcmd
 EOF
+}
 populate_sunxi() {
+	:
+}
 populate_tegra() {
+	:
+}
 populate() {
 	echo "${bar} looking for kernels in ${kernel} ${bar}"
 	kernels=""
 	# .ub kernels
 	for k in $kernels_beagle $kernels_awin $kernels_sunxi $kernels_amlogic $kernels_tegra; do
 		f="${kernel}/netbsd-${k}.ub.gz"
 		test -f "${f}" && kernels="${kernels} ${f}"
 	done
 	# .bin kernels
 	for k in $kernels_rpi; do
 		f="${kernel}/netbsd-${k}.bin.gz"
 		test -f "${f}" && kernels="${kernels} ${f}"
 	done
 	# .dtb files
 	for k in $kernels_sunxi $kernels_tegra; do
 		test -d "${KERNOBJDIR}/${k}" && \
 		    dtbs="$(${MAKE} -C ${KERNOBJDIR}/${k} -v DTB)" || \
 		    dtbs=
 		for dtb in $dtbs; do
 			f="${kernel}/${dtb}.gz"
 			test -f "${f}" && kernels="${kernels} ${f}"
 		done
 	done
 	# install kernels to /boot partition
 	for k in ${kernels}; do
 		tgt="$(basename ${k} | sed 's/\.gz$//')"
 		echo "${bar} installing ${k} to /boot/${tgt} ${bar}"
 		case "${k}" in
 		*.gz)
 			${GZIP_CMD} -dc "${k}" > "${mnt}/boot/${tgt}"
 			;;
 		*)
 			cp "${k}" "${mnt}/boot/${tgt}"
 			;;
-		esac
+		esac ||
 			fail "Copy of ${k} to ${mnt}/boot/${tgt} failed"
 	done
 	# board specific configuration
 	populate_beagle
 	populate_awin
 	populate_rpi
 	populate_amlogic
 	populate_tegra
 	populate_sunxi
 	# common configuration
 	populate_common
+}

 @@ -1,95 +1,95 @@
-# $NetBSD: rpi.conf,v 1.31 2017/11/09 21:36:46 skrll Exp $
+# $NetBSD: rpi.conf,v 1.32 2017/11/28 02:56:44 kre Exp $
 # Raspberry Pi customization script used by mkimage
+#
 board=rpi
 kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI.bin
 resize=true
 . ${DIR}/conf/evbarm.conf
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 make_fstab() {
 	make_fstab_evbarm
+}
 make_label() {
 	make_label_evbarm
+}
 customize() {
 	customize_evbarm
 	cat >> ${mnt}/etc/rc.conf << EOF
 wscons=YES
 devpubd=YES
 EOF
+	#
 	# If arm_freq is specified in config.txt, set CPU frequency
 	# to match at boot time.
+	#
 	cp ${release}/etc/rc.local ${mnt}/etc/rc.local
 	cat >> ${mnt}/etc/rc.local << EOF
 if /sbin/sysctl -q machdep.cpu.frequency.max; then
 	cpufreq_max=\$(/sbin/sysctl -n machdep.cpu.frequency.max)
 	cpufreq_cur=\$(/sbin/sysctl -n machdep.cpu.frequency.current)
 	if [ ! "\$cpufreq_max" = "\$cpufreq_cur" ]; then
 		/sbin/sysctl -w machdep.cpu.frequency.target=\$cpufreq_max
 	fi
 fi
 EOF
 	echo "./etc/rc.local type=file uname=root gname=wheel mode=0644" \
 	    >> "$tmp/selected_sets"
+}
 populate() {
 	rpi2_kernel="$(echo $kernel | sed 's/RPI/RPI2/g')"
 	cat > ${mnt}/boot/cmdline.txt << EOF
 root=ld0a console=fb
 #fb=1280x1024		# to select a mode, otherwise try EDID
 #fb=disable		# to disable fb completely
 EOF
 	cat > ${mnt}/boot/config.txt << EOF
 # UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
 enable_uart=1
 force_turbo=0
 EOF
 	if [ ! -f ${kernel} ]; then
 		echo ${PROG}: Missing ${kernel} 1>&2
 		exit 1
 	fi
 	echo "${bar} installing RPI kernel ${bar}"
 	case ${kernel} in
 	*.gz)
 		gzip -dc ${kernel} > ${mnt}/boot/kernel.img
 		;;
 	*)
 		cp ${kernel} ${mnt}/boot/kernel.img
 		;;
-	esac
+	esac || fail "copy of ${kernel} to ${mnt}/boot/kernel.img failed"
 	echo "${bar} installing RPI2 kernel ${bar}"
 	case ${rpi2_kernel} in
 	*.gz)
 		gzip -dc ${rpi2_kernel} > ${mnt}/boot/kernel7.img
 		;;
 	*)
-		cp ${rpi_kernel} ${mnt}/boot/kernel7.img
+		cp ${rpi2_kernel} ${mnt}/boot/kernel7.img
 		;;
-	esac
+	esac || fail "Copy of ${rpi2_kernel} to ${mnt}/boot/kernel7.img failed"
 	echo "${bar} installing firmware files ${bar}"
 	(cd ${mnt}/boot &&
 		for f in ${firmwarefiles}; do
 			echo " $f"
-			cp ${firmwaredir}/${f} .
+			cp ${firmwaredir}/${f} . || exit 1
 		done
 	) || fail "Copy of firmeware into ${mnt}/boot failed"
+}

 @@ -1,115 +1,115 @@
-# $NetBSD: rpi_inst.conf,v 1.9 2017/07/31 16:34:22 jmcneill Exp $
+# $NetBSD: rpi_inst.conf,v 1.10 2017/11/28 02:56:44 kre Exp $
 # Raspberry Pi customization script used by mkimage
+#
 board=rpi_inst
 kernel=$src/sys/arch/evbarm/compile/RPI/netbsd-RPI_INSTALL.bin
 . ${DIR}/conf/evbarm.conf
 image=$HOME/${board}.img
 swap=8
 extra=8		# spare space
 boot=112
 init=8
 size=$(( 10485760 + ${swap} * 1024 * 512 + ${boot} * 1024 * 512 + ${init} * 1024 * 512 ))
 msdosid=12
 make_label() {
 	# compute all sizes in terms of sectors
 	local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
 	local swapsize=$(( ${swap} * 1024 ))
 	local bootsize=$(( ${boot} * 1024 ))
 	local bootoffset=$(( ${init} * 1024 ))
 	local swapoffset=$(( ${bootoffset} + ${bootsize} ))
 	local asize=$(( ${totalsize} - ${swapsize} - ${bootsize} - ${bootoffset} ))
 	local aoffset=$(( ${swapoffset} + ${swapsize} ))
 	local bps=512
 	local spt=32
 	local tpc=64
 	local spc=2048
 	local cylinders=$(( ${totalsize} / ${spc} ))
 	cat << EOF
 type: SCSI
 disk: STORAGE DEVICE
 label: fictitious
 flags: removable
 bytes/sector: ${bps}
 sectors/track: ${spt}
 tracks/cylinder: ${tpc}
 sectors/cylinder: ${spc}
 cylinders: ${cylinders}
 total sectors: ${totalsize}
 rpm: 3600
 interleave: 1
 trackskew: 0
 cylinderskew: 0
 headswitch: 0           # microseconds
 track-to-track seek: 0  # microseconds
 drivedata: 0
 partitions:
 #     size         offset        fstype [fsize bsize cpg/sgs]
  a:   ${asize}     ${aoffset}    4.2BSD  ${fsize} ${bsize} 0  #
  b:   ${swapsize}  ${swapoffset} swap                         #
  d:   ${totalsize} 0             unused      0     0          #
  e:   ${bootsize}  ${bootoffset} MSDOS                        #
 EOF
+}
 customize() {
 	echo "${bar} creating directories ${bar}"
 	mkdir ${mnt}/proc ${mnt}/kern
+}
 make_fstab() {
+	:
+}
 firmwaredir=$src/external/broadcom/rpi-firmware/dist
 firmwarefiles="LICENCE.broadcom bootcode.bin fixup.dat fixup_cd.dat start.elf start_cd.elf"
 populate() {
 	cat > ${mnt}/boot/cmdline.txt << EOF
 root=ld0a console=fb
 #fb=1280x1024		# to select a mode, otherwise try EDID
 #fb=disable		# to disable fb completely
 EOF
 	cat > ${mnt}/boot/config.txt << EOF
 # UART settings, see https://www.raspberrypi.org/documentation/configuration/uart.md
 enable_uart=1
 force_turbo=0
 EOF
 	if [ ! -f ${kernel} ]; then
 		echo ${PROG}: Missing ${kernel} 1>&2
 		exit 1
 	fi
 	echo "${bar} installing kernel ${bar}"
 	case ${kernel} in
 	*.gz)
 		${GZIP_CMD} -dc ${kernel} > ${mnt}/boot/kernel.img
 		;;
 	*)
 		cp ${kernel} ${mnt}/boot/kernel.img
 		;;
-	esac
+	esac || fail "copy of ${kernel} to  ${mnt}/boot/kernel.img failed"
 	echo "${bar} installing firmware files ${bar}"
 	(cd ${mnt}/boot &&
 		for f in ${firmwarefiles}; do
 			echo " $f"
-			cp ${firmwaredir}/${f} .
+			cp ${firmwaredir}/${f} . || exit 1
 		done
 	) || fail "Copy of firmware to ${mnt}/boot failed"
+}

 @@ -1,149 +1,150 @@
-# $NetBSD: x86.conf,v 1.7 2015/01/29 14:54:06 skrll Exp $
+# $NetBSD: x86.conf,v 1.8 2017/11/28 02:56:44 kre Exp $
 # x86 shared config
+#
 image=$HOME/${board}.img
 MACHINE=${board}
 kernel=$src/sys/arch/${board}/compile/GENERIC/netbsd
 bootfile=$release/usr/mdec/boot
 extra=8		# spare space
 size=0		# autocompute
 netbsdid=169
 init=63
 ffsoffset=${init}b
 make_label() {
 	# compute all sizes in terms of sectors
 	local totalsize=$(( ${newsize} * 1024 * 2 / 512 ))
 	local aoffset=${init}
 	local asize=$(( ${totalsize} - ${aoffset} ))
 	local bps=512
 	local spt=32
 	local tpc=64
 	local spc=2048
 	local cylinders=$(( ${totalsize} / ${spc} ))
 	cat << EOF
 type: SCSI
 disk: STORAGE DEVICE
 label: fictitious
 flags: removable
 bytes/sector: ${bps}
 sectors/track: ${spt}
 tracks/cylinder: ${tpc}
 sectors/cylinder: ${spc}
 cylinders: ${cylinders}
 total sectors: ${totalsize}
 rpm: 3600
 interleave: 1
 trackskew: 0
 cylinderskew: 0
 headswitch: 0           # microseconds
 track-to-track seek: 0  # microseconds
 drivedata: 0
 partitions:
 #     size         offset        fstype [fsize bsize cpg/sgs]
  a:   ${asize}     ${aoffset}    4.2BSD  ${fsize} ${bsize} 0  #
  c:   ${totalsize} 0             unused      0     0          #
  d:   ${totalsize} 0             unused      0     0          #
 EOF
+}
 make_fstab_normal() {
 	cat > ${mnt}/etc/fstab << EOF
 # NetBSD /etc/fstab
 # See /usr/share/examples/fstab/ for more examples.
 /dev/${rootdev}0a	/		ffs	rw,log	1 1
 kernfs		/kern		kernfs	rw
 ptyfs		/dev/pts	ptyfs	rw
 procfs		/proc		procfs	rw
 EOF
+}
 # From Richard Neswold's:
 # http://rich-tbp.blogspot.com/2013/03/netbsd-on-rpi-minimizing-disk-writes.html
 # Also for the postfix stuff below
 make_fstab_minwrites() {
 	cat > ${mnt}/etc/fstab << EOF
 # NetBSD /etc/fstab
 # See /usr/share/examples/fstab/ for more examples.
 /dev/${rootdev}0a	/			ffs	rw,log,noatime,nodevmtime 1 1
 kernfs		/kern			kernfs	rw
 ptyfs		/dev/pts		ptyfs	rw
 procfs		/proc			procfs	rw
 tmpfs		/tmp			tmpfs	rw,-s32M
 tmpfs		/var/log		tmpfs	rw,union,-s32M
 tmpfs		/var/run		tmpfs	rw,union,-s1M
 tmpfs		/var/mail		tmpfs	rw,union,-s10M
 tmpfs		/var/spool/postfix	tmpfs	rw,union,-s20M
 tmpfs		/var/db/postfix		tmpfs	rw,union,-s1M
 tmpfs		/var/chroot		tmpfs	rw,union,-s10M
 EOF
+}
 make_fstab() {
 	if $minwrites; then
 		make_fstab_minwrites
 	else
 		make_fstab_normal
 	fi
 	echo "./etc/fstab type=file uname=root gname=wheel mode=0755" \
 	    >> "$tmp/selected_sets"
 	echo "./proc type=dir uname=root gname=wheel mode=0755" \
 	    >> "$tmp/selected_sets"
 	echo "./kern type=dir uname=root gname=wheel mode=0755" \
 	    >> "$tmp/selected_sets"
+}
 customize() {
 	cp ${release}/etc/rc.conf ${mnt}/etc/rc.conf
 	if $minwrites; then
 		mkdir ${mnt}/etc/postfix
 		(umask 022
 		sed -e 's/fifo/unix/' < ${release}/etc/postfix/master.cf > \
 		    ${mnt}/etc/postfix/master.cf)
 	fi
 	cat >> ${mnt}/etc/rc.conf << EOF
 rc_configured=YES
 hostname=${board}
 sshd=YES
 dhcpcd=YES
 wscons=YES
 devpubd=YES
 EOF
 	echo "./etc/rc.conf type=file uname=root gname=wheel mode=0644" \
 	    >> "$tmp/selected_sets"
 	if [ ! -f ${release}/dev/MAKEDEV ]; then
 		echo ${PROG}: Missing ${release}/dev/MAKEDEV 1>&2
 		exit 1
 	fi
 	echo "${bar} running MAKEDEV ${bar}"
 	${HOST_SH} ${release}/dev/MAKEDEV -s all | sed -e 's:^\./:\./dev/:' \
 	    >> "$tmp/selected_sets"
+}
 populate() {
 	if [ ! -f ${kernel} ]; then
 		echo ${PROG}: Missing ${kernel} 1>&2
 		exit 1
 	fi
 	echo "${bar} installing kernel ${bar}"
 	cp ${kernel} ${mnt}/netbsd
 	if [ ! -f ${bootfile} ]; then
 		echo ${PROG}: Missing ${bootfile} 1>&2
 		exit 1
 	fi
-	cp ${bootfile} ${mnt}/boot
+	cp ${bootfile} ${mnt}/boot ||
 	    fail "copy of ${bootfile} to ${mnt}/boot failed"
 	echo "./netbsd type=file uname=root gname=wheel mode=0755" \
 	    >> "$tmp/selected_sets"
 	echo "./boot type=file uname=root gname=wheel mode=0444" \
 	    >> "$tmp/selected_sets"
+}