From 7c6bf4c8672f3c6e0d94957954a975ce7dc796c1bb848a560cdf35db89b44f32 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Thu, 23 Mar 2023 08:27:07 +0000
Subject: [PATCH] Accepting request 1073911 from
 home:michael-chang:branches:Base:System

- 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
---
 grub2-btrfs-05-grub2-mkconfig.patch | 17 ++++++++++++++---
 grub2.changes                       |  7 +++++++
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/grub2-btrfs-05-grub2-mkconfig.patch b/grub2-btrfs-05-grub2-mkconfig.patch
index f7eebeb..94a4c62 100644
--- a/grub2-btrfs-05-grub2-mkconfig.patch
+++ b/grub2-btrfs-05-grub2-mkconfig.patch
@@ -1,3 +1,7 @@
+
+Always declare path specification in case of inconsistent declaration
+elsewhere. (bsc#1209165)
+
 ---
  util/grub-mkconfig.in       |    3 ++-
  util/grub-mkconfig_lib.in   |    4 ++++
@@ -22,7 +26,7 @@
  is_path_readable_by_grub ()
 --- a/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"
  
@@ -32,12 +36,19 @@
 +set btrfs_relative_path="y"
 +export btrfs_relative_path
 +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
 +
  # Do this as early as possible, since other commands might depend on it.
  # (e.g. the `loadfont' command might need lvm or raid modules)
  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
  
  cat << EOF
@@ -48,7 +59,7 @@
    load_env
  fi
  
-@@ -401,3 +411,15 @@
+@@ -401,3 +418,15 @@
  if [ "x${GRUB_BADRAM}" != "x" ] ; then
    echo "badram ${GRUB_BADRAM}"
  fi
diff --git a/grub2.changes b/grub2.changes
index 9e36a34..01832b0 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -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>