Remove support for nanobsd images < 2gb. Fixes #5836

4 files changed, 3 insertions, 6 deletions

diff --git a/build.sh b/build.sh
index 00d89f4..ff144f2 100755
--- a/build.sh
+++ b/build.sh
@@ -54,7 +54,7 @@ usage() {
 	echo "Usage $0 [options] [ iso | nanobsd | ova | nanobsd-vga | memstick | memstickserial | memstickadi | fullupdate | all ]"
 	echo "		all = iso nanobsd nanobsd-vga memstick memstickserial memstickadi fullupdate"
 	echo "	[ options ]: "
-	echo "		--flash-size|-f size(s) - a list of flash sizes to build with nanobsd i.e. '512m 1g'. Default: 512m"
+	echo "		--flash-size|-f size(s) - a list of flash sizes to build with nanobsd i.e. '2g 4g'. Default: 2g"
 	echo "		--no-buildworld|-c - Will set NO_BUILDWORLD NO_BUILDKERNEL to not build kernel and world"
 	echo "		--no-cleanobjdir|--no-cleanrepos|-d - Will not clean FreeBSD object built dir to allow restarting a build with NO_CLEAN"
 	echo "		--resume-image-build|-r - Includes -c -d and also will just move directly to image creation using pre-staged data"
diff --git a/tools/build_snapshots.sh b/tools/build_snapshots.sh
index 87d101d..5297d17 100755
--- a/tools/build_snapshots.sh
+++ b/tools/build_snapshots.sh
@@ -185,7 +185,7 @@ while [ /bin/true ]; do
 			snapshot_update_status "${LINE}"
 		done
 
-		(${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --flash-size '1g 2g 4g' \
+		(${BUILDER_ROOT}/build.sh ${NO_UPLOAD} --flash-size '2g 4g' \
 		    --snapshots 2>&1) | while read -r LINE; do
 			snapshot_update_status "${LINE}"
 		done
diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index 7b81bdc..82f1420 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -490,9 +490,6 @@ nanobsd_set_flash_details () {
 	# NB: notice math error in SDCFJ-4096-388 line.
 	#
 	case "${a1}" in
-		1024|1024m|1024mb|1g)
-			NANO_MEDIASIZE=$((997129216/512))
-			;;
 		2048|2048m|2048mb|2g)
 			NANO_MEDIASIZE=$((1989999616/512))
 			;;
diff --git a/tools/builder_defaults.sh b/tools/builder_defaults.sh
index eb0e173..70ee8d0 100644
--- a/tools/builder_defaults.sh
+++ b/tools/builder_defaults.sh
@@ -224,7 +224,7 @@ export NANO_IMAGES=2
 # 1 -> Initialize second image with a copy of the first
 export NANO_INIT_IMG2=1
 export NANO_NEWFS="-b 4096 -f 512 -i 8192 -O1"
-export FLASH_SIZE=${FLASH_SIZE:-"1g"}
+export FLASH_SIZE=${FLASH_SIZE:-"2g"}
 # Size of code file system in 512 bytes sectors
 # If zero, size will be as large as possible.
 export NANO_CODESIZE=0