Author: imp
Date: Fri Mar 14 19:46:32 2014
New Revision: 263188
URL: http://svnweb.freebsd.org/changeset/base/263188

Log:
  When NANO_IMAGE_MBRONLY is set, and we're backing via swap, only copy
  the MBR.
  
  PR: 136889
  Submitted by: Aragon Gouveia

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

Modified: head/tools/tools/nanobsd/nanobsd.sh
==============================================================================
--- head/tools/tools/nanobsd/nanobsd.sh Fri Mar 14 19:46:18 2014        
(r263187)
+++ head/tools/tools/nanobsd/nanobsd.sh Fri Mar 14 19:46:32 2014        
(r263188)
@@ -136,6 +136,9 @@ NANO_BOOT2CFG="-h"
 # Can be "file" or "swap"
 NANO_MD_BACKING="file"
 
+# for swap type md(4) backing, write out the mbr only
+NANO_IMAGE_MBRONLY=true
+
 # Progress Print level
 PPLEVEL=3
 
@@ -573,6 +576,14 @@ create_i386_diskimage ( ) (
        fi
 
        if [ "${NANO_MD_BACKING}" = "swap" ] ; then
+               if [ ${NANO_IMAGE_MBRONLY} ]; then
+                       echo "Writing out _.disk.mbr..."
+                       dd if=/dev/${MD} of=${NANO_DISKIMGDIR}/_.disk.mbr 
bs=512 count=1
+               else
+                       echo "Writing out ${NANO_IMGNAME}..."
+                       dd if=/dev/${MD} of=${IMG} bs=64k
+               fi
+
                echo "Writing out ${NANO_IMGNAME}..."
                dd conv=sparse if=/dev/${MD} of=${IMG} bs=64k
        fi
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to