Hello community, here is the log from the commit of package syslinux for openSUSE:Factory checked in at 2013-03-01 20:45:23 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/syslinux (Old) and /work/SRC/openSUSE:Factory/.syslinux.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "syslinux", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/syslinux/syslinux.changes 2013-02-18 14:00:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.syslinux.new/syslinux.changes 2013-03-01 20:45:27.000000000 +0100 @@ -1,0 +2,5 @@ +Thu Feb 28 16:00:50 CET 2013 - [email protected] + +- isohybrid_mbr.diff: write only mbr unless explicitly specified otherwise + +------------------------------------------------------------------- New: ---- syslinux-4.04-isohybrid_mbr.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ syslinux.spec ++++++ --- /var/tmp/diff_new_pack.jq1RtH/_old 2013-03-01 20:45:38.000000000 +0100 +++ /var/tmp/diff_new_pack.jq1RtH/_new 2013-03-01 20:45:38.000000000 +0100 @@ -44,6 +44,7 @@ Patch7: %{name}-%{version}-gcc47.diff Patch8: %{name}-%{version}-isohybrid_efi.diff Patch9: %{name}-%{version}-isohybrid_efi_optional.diff +Patch10: %{name}-%{version}-isohybrid_mbr.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,6 +70,7 @@ %patch7 -p0 %patch8 -p0 %patch9 -p1 +%patch10 -p1 %build cp %{SOURCE2} . ++++++ syslinux-4.04-isohybrid_mbr.diff ++++++ diff --git a/utils/isohybrid.c b/utils/isohybrid.c index 09f4520..954b5ed 100644 --- a/utils/isohybrid.c +++ b/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; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
