grub2: update to 2.06

[openwrt/staging/chunkeey.git] / package / boot / grub2 / patches / 100-grub_setup_root.patch

diff --git a/package/boot/grub2/patches/100-grub_setup_root.patch b/package/boot/grub2/patches/100-grub_setup_root.patch
index e075d052cbc2f0cacf2d2df522d933dacec49ca0..f20b310e120877f81b0b5277101fe606007dd0ff 100644 (file)
--- a/package/boot/grub2/patches/100-grub_setup_root.patch
+++ b/package/boot/grub2/patches/100-grub_setup_root.patch
@@ -18,24 +18,24 @@
  
 --- a/util/grub-install.c
 +++ b/util/grub-install.c
-@@ -1720,7 +1720,7 @@ main (int argc, char *argv[])
-       /*  Now perform the installation.  */
+@@ -1721,7 +1721,7 @@ main (int argc, char *argv[])
        if (install_bootsector)
-         grub_util_bios_setup (platdir, "boot.img", "core.img",
--                              install_drive, force,
-+                              NULL, install_drive, force,
-                               fs_probe, allow_floppy, add_rs_codes,
-                               !grub_install_is_short_mbrgap_supported ());
-       break;
-@@ -1747,7 +1747,7 @@ main (int argc, char *argv[])
-       /*  Now perform the installation.  */
+         {
+           grub_util_bios_setup (platdir, "boot.img", "core.img",
+-                                install_drive, force,
++                                NULL, install_drive, force,
+                                 fs_probe, allow_floppy, add_rs_codes,
+                                 !grub_install_is_short_mbrgap_supported ());
+ 
+@@ -1752,7 +1752,7 @@ main (int argc, char *argv[])
        if (install_bootsector)
-         grub_util_sparc_setup (platdir, "boot.img", "core.img",
--                               install_drive, force,
-+                               NULL, install_drive, force,
-                                fs_probe, allow_floppy,
-                                0 /* unused */, 0 /* unused */ );
-       break;
+         {
+           grub_util_sparc_setup (platdir, "boot.img", "core.img",
+-                                 install_drive, force,
++                                 NULL, install_drive, force,
+                                  fs_probe, allow_floppy,
+                                  0 /* unused */, 0 /* unused */ );
+ 
 --- a/util/grub-setup.c
 +++ b/util/grub-setup.c
 @@ -87,6 +87,8 @@ static struct argp_option options[] = {