 @@ -1,16 +1,16 @@
 #! /bin/sh
-# $NetBSD: mkimage,v 1.11 2013/01/15 21:04:41 christos Exp $
+# $NetBSD: mkimage,v 1.12 2013/01/16 15:58:19 christos Exp $
 # Copyright (c) 2012 Alistair Crooks <agc@NetBSD.org>
 # All rights reserved.
+#
 # 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.
+#
 @@ -58,62 +58,73 @@ next_avail ()
 			echo "${dev}${N}"
 			return
 		fi
 	done
 	test -e /dev/"${dev}${N}a" || {
 		echo >&2 "All ${dev}s in use"
 		return 1
+	}
 	echo "${dev}${N}"
+}
 usage() {
 	cat << EOF 1>&2
 Usage: $PROG [-S <setsdir>] [-c <custom-files-dir>] [-h <host-arch>] [-s <size>]
 EOF
 exit 1
+}
 # Return the filesystem size for an ls -l or tar -xvf list
 # Directories and symlinks in tar are 0 size, we assume one block
 # (which is too much), we round up by the fragment size the rest.
 getfssize() {
 	local bsize="$1"
 	local fsize="$2"
 	awk -v fsize=${fsize} -v bsize=${bsize} '
 	NF >= 9 && $1 != "tar:" {
 		if ($5 == 0)
 			tot += bsize;
 		else
 			tot += ((int)(($5 + fsize - 1) / fsize)) * fsize;
+	}
 	END {
 		printf("%d\n", tot);
 	}'
+}
 # find the size of the gzipped files in a .tgz archive
 # Directories appear as 0, so count them as one block
 # and round up files to a fragment.
 sizeone() {
 	if [ ! -f "$1" ]
 	then
 		echo "$PROG: Missing set $1" 1>&2
 		echo 0
 		return;
 	fi
         case "$1" in
         *.tgz|*.tar.gz|*.tbz|*.tar.bz2|*.txz|*.tar.xz)
-                tar tvzf "$1" |
+                tar tvzf "$1" | getfssize ${bsize} ${fsize}
 		awk -v fsize=${fsize} -v bsize=${bsize} '
 			if ($5 == 0)
 				tot += bsize;
 			else
 				tot += ((int)(($5 + fsize - 1) / fsize)) * fsize;
 		END {
 			printf("%d\n", tot);
 		}'
                 ;;
         *)
                 echo 0
                 ;;
         esac
+}
 usage() {
 	cat << EOF 1>&2
 Usage: $PROG [-S <setsdir>] [-c <custom-files-dir>] [-h <host-arch>] [-s <size>]
 EOF
 exit 1
 # Return the usable filesystem size in bytes, given the total size in bytes,
 # and optionally block and fragment sizes
 getffssize() {
 	local bytes="$1"
 	local barg
 	local farg
 	local overhead
 	if [ -n "$2" ]
 	then
 		barg="-b $2"
 		if [ -n "$3" ]
 @@ -171,26 +182,27 @@ finish() {
 DIR="$(dirname "$0")"
 PROG="$(basename "$0")"
 bar="==="
 sudo=
 mnt="${TMPDIR:-/tmp}/image.$$"
 src="/usr/src"
 obj="/usr/obj"
 # Presumable block and fragment size.
 bsize=16384
 fsize=2048
 mtob=$(( 1024 * 1024 ))
 # First pass for options to get the host
 OPTS="S:c:h:s:x"
 while getopts "$OPTS" f
 do
 	case $f in
 	h)	h="$OPTARG";;
 	*)	;;
 	esac
 done
 if [ -z "$h" ]
 then
 @@ -222,44 +234,43 @@ trap finish 0 1 2 3 15
 shift $(( "$OPTIND" - 1 ))
 if [ -n "$1" ]; then
 	# take the next argument as being the image name
 	image="$1"
 	shift
 fi
 # calculate the set bytes
 setbytes=0
 echo -n "${bar} computing set sizes ("
 for s in ${sets}; do
 	one="$(sizeone ${setsdir}/${s}.tgz)"
-	echo -n " $s=$(( ${one} / 1024 / 1024 ))MB"
+	echo -n " $s=$(( ${one} / ${mtob} ))MB"
 	setbytes=$(( ${setbytes} +  ${one} ))
 done
-echo "): $(( ${setbytes} / 1024 / 1024 ))MB ${bar}"
+echo "): $(( ${setbytes} / ${mtob} ))MB ${bar}"
 # calculate size of custom files
 custbytes=0
 if [ -d "${custom}" ]; then
-	custbytes=$(ls -lR "${custom}" |
+	custbytes=$(ls -lR "${custom}" | getfssize ${bsize} ${fsize})
 	    awk 'NF == 9 { tot += $5 } END { print tot }')
 fi
-echo "${bar} computing custom sizes: $(( ${custbytes} / 1024 / 1024 ))MB ${bar}"
+echo "${bar} computing custom sizes: $(( ${custbytes} / ${mtob} ))MB ${bar}"
 # how many bytes
 rawbytes="$(( ${setbytes} + ${custbytes} ))"
-echo -n "${bar} computing ffs filesystem size for $(( ${rawbytes} / 1024 / 1024 ))MB: "
+echo -n "${bar} computing ffs filesystem size for $(( ${rawbytes} / ${mtob} ))MB: "
 ffsbytes="$(makeffssize "${rawbytes}")"
-ffsmb=$(( ${ffsbytes} / 1024 / 1024 ))
+ffsmb=$(( ${ffsbytes} / ${mtob} ))
 echo " ${ffsmb}MB ${bar}"
 # total in MB
 total=$(( ${ffsmb} + ${overhead} ))
 echo "${bar} overhead: ${overhead}MB ${bar}"
 if [ $size -eq 0 ]; then
         # auto-size the pkgs fs
         newsize=${total}
 else
         # check that we've been given enough space
         if [ ${total} -gt ${size} ]; then
                 echo "$PROG: Given size is ${size} MB, but we need ${total} MB" >&2