svn commit: r271846 - stable/10/usr.bin/mkimg

[Marcel Moolenaar]

Author: marcel
Date: Thu Sep 18 22:27:02 2014
New Revision: 271846
URL: http://svnweb.freebsd.org/changeset/base/271846

Log:
  Be compatible with boot code that starts right after the disk label in
  the second sector by only clearing the amount of bytes needed for the
  disklabel in the second sector. Previously we were clearing exactly 1
  sector worth of bytes and as such writing over boot code that may have
  been there.
  Since we do support more than 8 partitions, make sure to set all fields
  in d_partitions. For the first 8 partitions this is unneeded, but for
  partitioons 9 and up this compensates for the fact that we don't clear
  an entire sector anymore.
  Obviously, one cannot use more than 8 partitions when using boot code
  that starts right after the disk label.
  
  Relevant GRNs:
  107879 - Employ unused bytes after the disklabel in the second sector.
  189500 - Revert the part of change 107879 that employs the unused bytes
  	 after the disklabel in the 2nd sector for boot code.
  
  Obtained from:	Juniper Networks, Inc.
  
  Approved by:	re@ (gjb)

Modified:
  stable/10/usr.bin/mkimg/bsd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/mkimg/bsd.c
==============================================================================
--- stable/10/usr.bin/mkimg/bsd.c	Thu Sep 18 22:22:14 2014	(r271845)
+++ stable/10/usr.bin/mkimg/bsd.c	Thu Sep 18 22:27:02 2014	(r271846)
@@ -76,7 +76,7 @@ bsd_write(lba_t imgsz, void *bootcode)
 		return (ENOMEM);
 	if (bootcode != NULL) {
 		memcpy(buf, bootcode, BBSIZE);
-		memset(buf + secsz, 0, secsz);
+		memset(buf + secsz, 0, sizeof(struct disklabel));
 	} else
 		memset(buf, 0, BBSIZE);
 
@@ -110,7 +110,10 @@ bsd_write(lba_t imgsz, void *bootcode)
 		dp = &d->d_partitions[n];
 		le32enc(&dp->p_size, part->size);
 		le32enc(&dp->p_offset, part->block);
+		le32enc(&dp->p_fsize, 0);
 		dp->p_fstype = ALIAS_TYPE2INT(part->type);
+		dp->p_frag = 0;
+		le16enc(&dp->p_cpg, 0);
 	}
 
 	dp = &d->d_partitions[bsdparts];