aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch')
-rw-r--r--meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch26
1 files changed, 26 insertions, 0 deletions
diff --git a/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch b/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
new file mode 100644
index 0000000000..58bd135564
--- /dev/null
+++ b/meta-oe/recipes-extended/efibootmgr/files/w-keep-existing-mbr-signature.patch
@@ -0,0 +1,26 @@
+Upstream-Status: Pending
+
+Import this patch from meta-linaro.
+
+Signed-off-by: Kai Kang <kai.kang@windriver.com>
+---
+Description: Fix -w option to leave an existing unique MBR signature intact
+ This makes the implementation match the documentation.
+Author: Colin Watson <cjwatson@ubuntu.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1065261
+Forwarded: no
+Last-Update: 2013-02-01
+
+Index: b/src/lib/disk.c
+===================================================================
+--- a/src/lib/disk.c
++++ b/src/lib/disk.c
+@@ -352,7 +352,7 @@
+ printf("******************************************************\n\n");
+
+ }
+- else if (opts.write_signature) {
++ else if (!mbr->unique_mbr_signature && opts.write_signature) {
+
+ /* MBR Signatures must be unique for the
+ EFI Boot Manager