From 315b19d9ebfa532e22dc8a36c34a2e342c1f3156657ad4c60cbe38261a046732 Mon Sep 17 00:00:00 2001
From: Steffen Winterfeldt <snwint@suse.com>
Date: Mon, 4 Mar 2013 13:59:51 +0000
Subject: [PATCH] - localboot.diff: -2 boots next disk (bnc #807157)

OBS-URL: https://build.opensuse.org/package/show/system:install:head/syslinux?expand=0&rev=52
---
 syslinux-4.04-localboot.diff | 20 ++++++++++++++++++++
 syslinux.changes             |  5 +++++
 syslinux.spec                |  2 ++
 3 files changed, 27 insertions(+)
 create mode 100644 syslinux-4.04-localboot.diff

diff --git a/syslinux-4.04-localboot.diff b/syslinux-4.04-localboot.diff
new file mode 100644
index 0000000..def4d89
--- /dev/null
+++ b/syslinux-4.04-localboot.diff
@@ -0,0 +1,20 @@
+diff --git a/core/localboot.inc b/core/localboot.inc
+index 1fe3102..30f34fc 100644
+--- a/core/localboot.inc
++++ b/core/localboot.inc
+@@ -33,6 +33,15 @@ local_boot:
+ 		cmp ax,-1
+ 		je .int18
+ 
++		cmp ax,-2
++		jne .load
++
++		mov al,[DriveNumber]
++		cmp al,80h
++		mov al,80h
++		jnz .load
++		inc ax
++.load:
+ 		; Load boot sector from the specified BIOS device and jump to it.
+ 		mov dl,al
+ 		xor dh,dh
diff --git a/syslinux.changes b/syslinux.changes
index b094bf7..21d6f90 100644
--- a/syslinux.changes
+++ b/syslinux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Mar  4 14:58:22 CET 2013 - snwint@suse.de
+
+- localboot.diff: -2 boots next disk (bnc #807157)
+
 -------------------------------------------------------------------
 Thu Feb 28 16:00:50 CET 2013 - snwint@suse.de
 
diff --git a/syslinux.spec b/syslinux.spec
index 9229513..9a5e5ab 100644
--- a/syslinux.spec
+++ b/syslinux.spec
@@ -45,6 +45,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
+Patch11:        %{name}-%{version}-localboot.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
@@ -71,6 +72,7 @@ Authors:
 %patch8 -p0
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 cp %{SOURCE2} .