aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-11-16 21:05:23 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-11-16 21:05:23 -0800
commiteea0f4d527b1a66fc78b0310a4dbb54ea08a4e96 (patch)
tree0cd2e2625b7f1543082e522cdd290fa7a7ac92ec
parent235864576279688ab7e191cdfc9e8533b6d75fe9 (diff)
parenta40b7070ab2831cd59adca88f8b5dcb6fbfef4b9 (diff)
downloadsyslinux.git-syslinux-3.84-pre3.tar.gz
syslinux.git-syslinux-3.84-pre3.tar.xz
syslinux.git-syslinux-3.84-pre3.zip
Merge branch 'master' into memdisk-isosyslinux-3.84-pre3
-rw-r--r--utils/isohybrid.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/isohybrid.in b/utils/isohybrid.in
index 0726bed9..a1277848 100644
--- a/utils/isohybrid.in
+++ b/utils/isohybrid.in
@@ -221,7 +221,7 @@ $mbr .= "\0\0"; # Offset 446: actual partition table
# 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 @@ $pentry = $opt{'entry'}; # Partition slot
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;
}