svn commit: r269983 - head/tools/tools/nanobsd

[Warner Losh]

Author: imp
Date: Thu Aug 14 16:17:23 2014
New Revision: 269983
URL: http://svnweb.freebsd.org/changeset/base/269983

Log:
  Only install the boot loader if it actually exists. This is a stop-gap
  change, since larger changes to use geom more exclusively to create
  partitions is in th works.

Modified:
  head/tools/tools/nanobsd/nanobsd.sh

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh	Thu Aug 14 16:01:51 2014	(r269982)
+++ head/tools/tools/nanobsd/nanobsd.sh	Thu Aug 14 16:17:23 2014	(r269983)
@@ -581,8 +581,14 @@ create_i386_diskimage ( ) (
 	fdisk ${MD}
 	# XXX: params
 	# XXX: pick up cached boot* files, they may not be in image anymore.
-	boot0cfg -B -b ${NANO_WORLDDIR}/${NANO_BOOTLOADER} ${NANO_BOOT0CFG} ${MD}
-	bsdlabel -w -B -b ${NANO_WORLDDIR}/boot/boot ${MD}s1
+	if [ -f ${NANO_WORLDDIR}/${NANO_BOOTLOADER} ]; then
+		boot0cfg -B -b ${NANO_WORLDDIR}/${NANO_BOOTLOADER} ${NANO_BOOT0CFG} ${MD}
+	fi
+	if [ -f ${NANO_WORLDDIR}/boot/boot ]; then
+		bsdlabel -w -B -b ${NANO_WORLDDIR}/boot/boot ${MD}s1
+	else
+		bsdlabel -w ${MD}s1
+	fi
 	bsdlabel ${MD}s1
 
 	# Create first image