diff options
Diffstat (limited to 'package/boot/grub2/patches/100-grub_setup_root.patch')
| -rw-r--r-- | package/boot/grub2/patches/100-grub_setup_root.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/package/boot/grub2/patches/100-grub_setup_root.patch b/package/boot/grub2/patches/100-grub_setup_root.patch index f053ba95e2..df671bc9d2 100644 --- a/package/boot/grub2/patches/100-grub_setup_root.patch +++ b/package/boot/grub2/patches/100-grub_setup_root.patch @@ -17,7 +17,7 @@ int force; int fs_probe; int allow_floppy; -@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct argp_state *state) +@@ -178,6 +181,13 @@ argp_parser (int key, char *arg, struct arguments->dev_map = xstrdup (arg); break; @@ -42,7 +42,7 @@ --- a/util/setup.c +++ b/util/setup.c -@@ -247,13 +247,12 @@ identify_partmap (grub_disk_t disk __attribute__ ((unused)), +@@ -252,13 +252,12 @@ identify_partmap (grub_disk_t disk __att void SETUP (const char *dir, const char *boot_file, const char *core_file, @@ -55,8 +55,8 @@ char *boot_img, *core_img, *boot_path; - char *root = 0; size_t boot_size, core_size; - #ifdef GRUB_SETUP_BIOS grub_uint16_t core_sectors; + grub_device_t root_dev = 0, dest_dev, core_dev; @@ -307,7 +306,10 @@ SETUP (const char *dir, core_dev = dest_dev; @@ -80,7 +80,7 @@ continue; --- a/include/grub/util/install.h +++ b/include/grub/util/install.h -@@ -184,13 +184,13 @@ grub_install_get_image_target (const char *arg); +@@ -191,13 +191,13 @@ grub_install_get_image_target (const cha void grub_util_bios_setup (const char *dir, const char *boot_file, const char *core_file, @@ -98,7 +98,7 @@ --- a/util/grub-install.c +++ b/util/grub-install.c -@@ -1673,7 +1673,7 @@ main (int argc, char *argv[]) +@@ -1712,7 +1712,7 @@ main (int argc, char *argv[]) /* Now perform the installation. */ if (install_bootsector) grub_util_bios_setup (platdir, "boot.img", "core.img", @@ -107,7 +107,7 @@ fs_probe, allow_floppy, add_rs_codes); break; } -@@ -1699,7 +1699,7 @@ main (int argc, char *argv[]) +@@ -1738,7 +1738,7 @@ main (int argc, char *argv[]) /* Now perform the installation. */ if (install_bootsector) grub_util_sparc_setup (platdir, "boot.img", "core.img", |