rpm/grub2
SHA256
1
0
Fork 0
forked from pool/grub2
Code Pull Requests Activity

Accepting request 484293 from home:arvidjaar:boo:1031025

Browse Source 
- update grub2-btrfs-workaround-grub2-once.patch to also store saved_entry
  in additional environment block (boo#1031025)

OBS-URL: https://build.opensuse.org/request/show/484293
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=267
This commit is contained in:
Michael Chang 2017-04-02 03:29:44 +00:00 committed by Git OBS Bridge
parent e1ec6a007e
commit 8ad5004e78
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
grub2-btrfs-workaround-grub2-once.patch
View File

@ -1,7 +1,7 @@
Index: grub-2.02~beta3/grub-core/kern/fs.c Index: grub-2.02~rc2/grub-core/kern/fs.c
=================================================================== ===================================================================
--- grub-2.02~beta3.orig/grub-core/kern/fs.c --- grub-2.02~rc2.orig/grub-core/kern/fs.c
+++ grub-2.02~beta3/grub-core/kern/fs.c +++ grub-2.02~rc2/grub-core/kern/fs.c
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
#include <grub/mm.h> #include <grub/mm.h>
#include <grub/term.h> #include <grub/term.h>
@ -24,10 +24,10 @@ Index: grub-2.02~beta3/grub-core/kern/fs.c
ret += size; ret += size;
len -= size; len -= size;
sector -= ((size + offset) >> GRUB_DISK_SECTOR_BITS); sector -= ((size + offset) >> GRUB_DISK_SECTOR_BITS);
Index: grub-2.02~beta3/util/grub-editenv.c Index: grub-2.02~rc2/util/grub-editenv.c
=================================================================== ===================================================================
--- grub-2.02~beta3.orig/util/grub-editenv.c --- grub-2.02~rc2.orig/util/grub-editenv.c
+++ grub-2.02~beta3/util/grub-editenv.c +++ grub-2.02~rc2/util/grub-editenv.c
@@ -23,8 +23,11 @@ @@ -23,8 +23,11 @@
#include <grub/util/misc.h> #include <grub/util/misc.h>
#include <grub/lib/envblk.h> #include <grub/lib/envblk.h>
@ -437,10 +437,10 @@ Index: grub-2.02~beta3/util/grub-editenv.c
if (strcmp (command, "create") == 0) if (strcmp (command, "create") == 0)
grub_util_create_envblk_file (filename); grub_util_create_envblk_file (filename);
else if (strcmp (command, "list") == 0) else if (strcmp (command, "list") == 0)
Index: grub-2.02~beta3/util/grub.d/00_header.in Index: grub-2.02~rc2/util/grub.d/00_header.in
=================================================================== ===================================================================
--- grub-2.02~beta3.orig/util/grub.d/00_header.in --- grub-2.02~rc2.orig/util/grub.d/00_header.in
+++ grub-2.02~beta3/util/grub.d/00_header.in +++ grub-2.02~rc2/util/grub.d/00_header.in
@@ -46,6 +46,11 @@ cat << EOF @@ -46,6 +46,11 @@ cat << EOF
if [ -s \$prefix/grubenv ]; then if [ -s \$prefix/grubenv ]; then
load_env load_env
@ -473,3 +473,14 @@ Index: grub-2.02~beta3/util/grub.d/00_header.in
set boot_once=true set boot_once=true
else else
set default="${GRUB_DEFAULT}" set default="${GRUB_DEFAULT}"
@@ -94,6 +105,10 @@ function savedefault {
if [ -z "\${boot_once}" ]; then
saved_entry="\${chosen}"
save_env saved_entry
+ if [ "\${env_block}" ] ; then
+ save_env -f "\${env_block}" saved_entry
+ fi
+
fi
}

6
grub2.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sun Mar 26 18:08:20 UTC 2017 - arvidjaar@gmail.com
- update grub2-btrfs-workaround-grub2-once.patch to also store saved_entry
in additional environment block (boo#1031025)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 20 09:43:58 UTC 2017 - mchang@suse.com Mon Mar 20 09:43:58 UTC 2017 - mchang@suse.com