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

Accepting request 1073911 from home:michael-chang:branches:Base:System

Browse Source 
- Fix aarch64 kiwi image's file not found due to '/@' prepended to path in
  btrfs filesystem. (bsc#1209165)
  * grub2-btrfs-05-grub2-mkconfig.patch

OBS-URL: https://build.opensuse.org/request/show/1073911
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=447
This commit is contained in:
Michael Chang 2023-03-23 08:27:07 +00:00 committed by Git OBS Bridge
parent 448b5a32b0
commit 7c6bf4c867
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
grub2-btrfs-05-grub2-mkconfig.patch
View File

@ -1,3 +1,7 @@
Always declare path specification in case of inconsistent declaration
elsewhere. (bsc#1209165)
--- ---
util/grub-mkconfig.in | 3 ++- util/grub-mkconfig.in | 3 ++-
util/grub-mkconfig_lib.in | 4 ++++ util/grub-mkconfig_lib.in | 4 ++++
@ -22,7 +26,7 @@
is_path_readable_by_grub () is_path_readable_by_grub ()
--- a/util/grub.d/00_header.in --- a/util/grub.d/00_header.in
+++ b/util/grub.d/00_header.in +++ b/util/grub.d/00_header.in
@@ -27,6 +27,14 @@ @@ -27,6 +27,21 @@
. "$pkgdatadir/grub-mkconfig_lib" . "$pkgdatadir/grub-mkconfig_lib"
@ -32,12 +36,19 @@
+set btrfs_relative_path="y" +set btrfs_relative_path="y"
+export btrfs_relative_path +export btrfs_relative_path
+EOF +EOF
+else
+# Always declare path specification in case of inconsistent declaration
+# elsewhere. (bsc#1209165)
+ cat <<EOF
+set btrfs_relative_path="n"
+export btrfs_relative_path
+EOF
+fi +fi
+ +
# Do this as early as possible, since other commands might depend on it. # Do this as early as possible, since other commands might depend on it.
# (e.g. the `loadfont' command might need lvm or raid modules) # (e.g. the `loadfont' command might need lvm or raid modules)
for i in ${GRUB_PRELOAD_MODULES} ; do for i in ${GRUB_PRELOAD_MODULES} ; do
@@ -43,7 +51,9 @@ @@ -43,7 +58,9 @@
if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi
cat << EOF cat << EOF
@ -48,7 +59,7 @@
load_env load_env
fi fi
@@ -401,3 +411,15 @@ @@ -401,3 +418,15 @@
if [ "x${GRUB_BADRAM}" != "x" ] ; then if [ "x${GRUB_BADRAM}" != "x" ] ; then
echo "badram ${GRUB_BADRAM}" echo "badram ${GRUB_BADRAM}"
fi fi

7
grub2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Mar 23 05:25:50 UTC 2023 - Michael Chang <mchang@suse.com>
- Fix aarch64 kiwi image's file not found due to '/@' prepended to path in
btrfs filesystem. (bsc#1209165)
* grub2-btrfs-05-grub2-mkconfig.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 20 05:02:01 UTC 2023 - Michael Chang <mchang@suse.com> Mon Mar 20 05:02:01 UTC 2023 - Michael Chang <mchang@suse.com>