SHA256
1
0
forked from pool/syslinux

- isohybrid: write only mbr unless explicitly specified otherwise

OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=49
This commit is contained in:
Steffen Winterfeldt 2013-02-28 15:02:26 +00:00 committed by Git OBS Bridge
parent e22f5f2c43
commit e0146823d6
3 changed files with 34 additions and 0 deletions

View File

@ -0,0 +1,27 @@
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;

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 28 16:00:50 CET 2013 - snwint@suse.de
- isohybrid: write only mbr unless explicitly specified otherwise
-------------------------------------------------------------------
Mon Feb 18 10:14:42 CET 2013 - snwint@suse.de

View File

@ -44,6 +44,7 @@ Patch6: %{name}-%{version}-libext2fs.diff
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 @@ Authors:
%patch7 -p0
%patch8 -p0
%patch9 -p1
%patch10 -p1
%build
cp %{SOURCE2} .