Hello community, here is the log from the commit of package grub2 for openSUSE:Factory checked in at 2019-06-18 14:53:30 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/grub2 (Old) and /work/SRC/openSUSE:Factory/.grub2.new.4811 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2" Tue Jun 18 14:53:30 2019 rev:205 rq:709900 version:2.02 Changes: -------- --- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2019-05-22 10:53:52.755206435 +0200 +++ /work/SRC/openSUSE:Factory/.grub2.new.4811/grub2.changes 2019-06-18 14:53:33.613509884 +0200 @@ -1,0 +2,8 @@ +Fri Jun 14 06:13:58 UTC 2019 - [email protected] + +- Avoid high resolution when trying to keep current mode (bsc#1133842) + * grub2-video-limit-the-resolution-for-fixed-bimap-font.patch +- Make GRUB_SAVEDEFAULT working with btrfs (bsc#1128592) + * grub2-grubenv-in-btrfs-header.patch + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ grub2-grubenv-in-btrfs-header.patch ++++++ --- /var/tmp/diff_new_pack.Twm4I6/_old 2019-06-18 14:53:36.309507865 +0200 +++ /var/tmp/diff_new_pack.Twm4I6/_new 2019-06-18 14:53:36.309507865 +0200 @@ -2,6 +2,8 @@ modify values set from userspace (e.g. "next_entry" set by grub2-once). As a workaround use the Btrfs header to store known data of the GRUB environment block. + +v2: export env_block and make sure to use the device of grubenv --- Index: grub-2.02/grub-core/kern/fs.c =================================================================== @@ -447,19 +449,21 @@ =================================================================== --- grub-2.02.orig/util/grub.d/00_header.in +++ grub-2.02/util/grub.d/00_header.in -@@ -46,6 +46,11 @@ cat << EOF +@@ -46,6 +46,13 @@ cat << EOF if [ -s \$prefix/grubenv ]; then load_env fi + +if [ "\${env_block}" ] ; then ++ set env_block="(\${root})\${env_block}" ++ export env_block + load_env -f "\${env_block}" +fi + EOF if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then cat <<EOF -@@ -55,6 +60,9 @@ elif [ "\${next_entry}" ] ; then +@@ -55,6 +62,9 @@ elif [ "\${next_entry}" ] ; then set default="\${next_entry}" set next_entry= save_env next_entry @@ -469,7 +473,7 @@ set boot_once=true else set default="${GRUB_DEFAULT}" -@@ -66,6 +74,9 @@ if [ "\${next_entry}" ] ; then +@@ -66,6 +76,9 @@ if [ "\${next_entry}" ] ; then set default="\${next_entry}" set next_entry= save_env next_entry @@ -479,12 +483,15 @@ set boot_once=true else set default="${GRUB_DEFAULT}" -@@ -94,6 +105,10 @@ function savedefault { +@@ -93,7 +106,12 @@ fi + function savedefault { if [ -z "\${boot_once}" ]; then saved_entry="\${chosen}" - save_env saved_entry +- save_env saved_entry + if [ "\${env_block}" ] ; then + save_env -f "\${env_block}" saved_entry ++ else ++ save_env saved_entry + fi + fi ++++++ grub2-video-limit-the-resolution-for-fixed-bimap-font.patch ++++++ --- /var/tmp/diff_new_pack.Twm4I6/_old 2019-06-18 14:53:36.433507772 +0200 +++ /var/tmp/diff_new_pack.Twm4I6/_new 2019-06-18 14:53:36.433507772 +0200 @@ -12,16 +12,28 @@ the steps in. https://wiki.archlinux.org/index.php/HiDPI#GRUB + +v2: efi_gop: Avoid high resolution when trying to keep current mode. + --- grub-core/video/efi_gop.c | 7 +++++++ grub-core/video/i386/pc/vbe.c | 8 +++++++- 2 files changed, 14 insertions(+), 1 deletion(-) -diff --git a/grub-core/video/efi_gop.c b/grub-core/video/efi_gop.c -index 1e7b396..1db39e7 100644 ---- a/grub-core/video/efi_gop.c -+++ b/grub-core/video/efi_gop.c -@@ -377,6 +377,13 @@ grub_video_gop_setup (unsigned int width, unsigned int height, +Index: grub-2.02/grub-core/video/efi_gop.c +=================================================================== +--- grub-2.02.orig/grub-core/video/efi_gop.c ++++ grub-2.02/grub-core/video/efi_gop.c +@@ -360,7 +360,7 @@ grub_video_gop_setup (unsigned int width + grub_err_t err; + unsigned bpp; + int found = 0; +- int avoid_low_resolution = 1; ++ int avoid_extreme_resolution = 1; + unsigned long long best_volume = 0; + unsigned int preferred_width = 0, preferred_height = 0; + grub_uint8_t *buffer; +@@ -377,13 +377,21 @@ grub_video_gop_setup (unsigned int width preferred_height = 600; grub_errno = GRUB_ERR_NONE; } @@ -35,11 +47,33 @@ } again: -diff --git a/grub-core/video/i386/pc/vbe.c b/grub-core/video/i386/pc/vbe.c -index b0d3190..68700ec 100644 ---- a/grub-core/video/i386/pc/vbe.c -+++ b/grub-core/video/i386/pc/vbe.c -@@ -994,7 +994,13 @@ grub_video_vbe_setup (unsigned int width, unsigned int height, + /* Keep current mode if possible. */ + if (gop->mode->info && +- (!avoid_low_resolution || +- (gop->mode->info->width >= 800 && gop->mode->info->height >= 600))) ++ (!avoid_extreme_resolution || ++ ((gop->mode->info->width >= 800 && gop->mode->info->height >= 600) && ++ (gop->mode->info->width <= 1920 && gop->mode->info->height <= 1080)))) + { + bpp = grub_video_gop_get_bpp (gop->mode->info); + if (bpp && ((width == gop->mode->info->width +@@ -456,9 +464,9 @@ again: + + if (!found) + { +- if (avoid_low_resolution && gop->mode->info) ++ if (avoid_extreme_resolution && gop->mode->info) + { +- avoid_low_resolution = 0; ++ avoid_extreme_resolution = 0; + goto again; + } + grub_dprintf ("video", "GOP: no mode found\n"); +Index: grub-2.02/grub-core/video/i386/pc/vbe.c +=================================================================== +--- grub-2.02.orig/grub-core/video/i386/pc/vbe.c ++++ grub-2.02/grub-core/video/i386/pc/vbe.c +@@ -994,7 +994,13 @@ grub_video_vbe_setup (unsigned int width { grub_vbe_get_preferred_mode (&width, &height); if (grub_errno == GRUB_ERR_NONE) @@ -54,6 +88,3 @@ else { /* Fall back to 640x480. This is conservative, but the largest --- -2.12.3 -
