forked from pool/syslinux
0620ccce49
%patchN syntax. - Normalize all patches to apply as -p1 + Rebased remove-note-gnu-section.patch + Rebased sysmacros.patch - Rename all *.diff files to *.patch, aligning one a common suffix: + syslinux-4.04-align.diff -> syslinux-4.04-align.patch + syslinux-4.04-cache_fix.diff -> syslinux-4.04-cache_fix.patch + syslinux-4.04-cwd.diff -> syslinux-4.04-cwd.patch + syslinux-4.04-gcc10.diff -> syslinux-4.04-gcc10.patch + syslinux-4.04-gcc47.diff -> syslinux-4.04-gcc47.patch + syslinux-4.04-geometry.diff -> syslinux-4.04-geometry.patch + syslinux-4.04-iso9660.diff -> syslinux-4.04-iso9660.patch + syslinux-4.04-isohybrid_efi.diff -> syslinux-4.04-isohybrid_efi.patch + syslinux-4.04-isohybrid_efi_optional.diff -> syslinux-4.04-isohybrid_efi_optional.patch + syslinux-4.04-isohybrid_mbr.diff -> syslinux-4.04-isohybrid_mbr.patch + syslinux-4.04-libext2fs.diff -> syslinux-4.04-libext2fs.patch + syslinux-4.04-localboot.diff -> syslinux-4.04-localboot.patch + syslinux-4.04-lzo.diff -> syslinux-4.04-lzo.patch + syslinux-4.04-mboot_bootif.diff -> syslinux-4.04-mboot_bootif.patch + syslinux-4.04-md5pass.diff -> syslinux-4.04-md5pass.patch + syslinux-4.04-miniacc.diff -> syslinux-4.04-miniacc.patch + syslinux-4.04-mtime.diff -> syslinux-4.04-mtime.patch + syslinux-4.04-noinitrd.diff -> syslinux-4.04-noinitrd.patch + syslinux-4.04-nostrip.diff -> syslinux-4.04-nostrip.patch + syslinux-4.04-pie.diff -> syslinux-4.04-pie.patch + syslinux-4.04-python3.diff -> syslinux-4.04-python3.patch + syslinux-4.04-timeout.diff -> syslinux-4.04-timeout.patch OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=109
28 lines
757 B
Diff
28 lines
757 B
Diff
Index: syslinux-4.04/utils/isohybrid.c
|
|
===================================================================
|
|
--- syslinux-4.04.orig/utils/isohybrid.c
|
|
+++ syslinux-4.04/utils/isohybrid.c
|
|
@@ -653,12 +653,10 @@ initialise_mbr(uint8_t *mbr)
|
|
continue;
|
|
}
|
|
|
|
- if (i == 1)
|
|
- mbr[0] = 0x80;
|
|
-
|
|
if (i == part_data)
|
|
{
|
|
chs = ofs2chs(offset);
|
|
+ mbr[0] = 0x80;
|
|
mbr[1] = chs >> 8;
|
|
mbr[2] = chs >> 16;
|
|
mbr[3] = chs >> 24;
|
|
@@ -945,7 +943,7 @@ main(int argc, char *argv[])
|
|
}
|
|
|
|
if (!(mode & (MODE_MBR | MODE_GPT))) {
|
|
- mode |= (mode & EFI) ? MODE_GPT : MODE_MBR;
|
|
+ mode |= MODE_MBR;
|
|
}
|
|
|
|
if ((mode & EFI) && !offset) type = 0;
|