diff options
| author | Dirk Neukirchen <plntyk.lede@plntyk.name> | 2021-06-10 12:15:58 +0200 |
|---|---|---|
| committer | Paul Spooren <mail@aparcar.org> | 2021-06-21 09:02:26 -1000 |
| commit | 2c9537e27495afdf929975c8a154cc66de902df0 (patch) | |
| tree | 11a2dcaded00aee65bc26d520a0c72e45b2b96bc /package/boot/grub2/patches/100-grub_setup_root.patch | |
| parent | f1e41155c98cb5f2e0647e064ec0b3cfbf346e41 (diff) | |
| download | upstream-2c9537e27495afdf929975c8a154cc66de902df0.tar.gz upstream-2c9537e27495afdf929975c8a154cc66de902df0.tar.bz2 upstream-2c9537e27495afdf929975c8a154cc66de902df0.zip | |
grub2: update to 2.06
-300-CVE-2015-8370.patch is upstreamed with different code
(upstream id: 451d80e52d851432e109771bb8febafca7a5f1f2)
- fixup OpenWrts setup_root patch
compile tested: x86_64,i386
runtime tested: VM x86_64,VM i386
- booted fine
- grub-editenv worked
Signed-off-by: Dirk Neukirchen <plntyk.lede@plntyk.name>
Diffstat (limited to 'package/boot/grub2/patches/100-grub_setup_root.patch')
| -rw-r--r-- | package/boot/grub2/patches/100-grub_setup_root.patch | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/package/boot/grub2/patches/100-grub_setup_root.patch b/package/boot/grub2/patches/100-grub_setup_root.patch index e075d052cb..f20b310e12 100644 --- 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[] = { |