commit eea0f4d527b1a66fc78b0310a4dbb54ea08a4e96
author H. Peter Anvin <hpa@zytor.com> Mon Nov 16 21:05:23 2009 -0800
committer H. Peter Anvin <hpa@zytor.com> Mon Nov 16 21:05:23 2009 -0800
tree 0cd2e2625b7f1543082e522cdd290fa7a7ac92ec
parent 235864576279688ab7e191cdfc9e8533b6d75fe9
parent a40b7070ab2831cd59adca88f8b5dcb6fbfef4b9

Merge branch 'master' into memdisk-iso

utils/isohybrid.in

diff --git a/utils/isohybrid.in b/utils/isohybrid.in
index 0726bed..a127784 100644
--- a/utils/isohybrid.in
+++ b/utils/isohybrid.in
@@ -221,7 +221,7 @@
 
 # Print partition table
 $offset  = $opt{'offset'};
-$psize   = $c*$h*$s;
+$psize   = $c*$h*$s - $offset;
 $bhead   = int($offset/$s) % $h;
 $bsect   = ($offset % $s) + 1;
 $bcyl    = int($offset/($h*$s));
@@ -236,7 +236,7 @@
 for ( $i = 1 ; $i <= 4 ; $i++ ) {
     if ( $i == $pentry ) {
 	$mbr .= pack("CCCCCCCCVV", 0x80, $bhead, $bsect, $bcyl, $fstype,
-		     $ehead, $esect, $ecyl, 0, $psize);
+		     $ehead, $esect, $ecyl, $offset, $psize);
     } else {
 	$mbr .= "\0" x 16;
     }