Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2023-03-25 18:54:05
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.31432 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Sat Mar 25 18:54:05 2023 rev:290 rq:1073913 version:2.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2023-03-22
22:29:17.617786131 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.31432/grub2.changes 2023-03-25
18:54:08.054280619 +0100
@@ -1,0 +2,7 @@
+Thu Mar 23 05:25:50 UTC 2023 - Michael Chang <mch...@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
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2-btrfs-05-grub2-mkconfig.patch ++++++
--- /var/tmp/diff_new_pack.mxxllS/_old 2023-03-25 18:54:11.214297138 +0100
+++ /var/tmp/diff_new_pack.mxxllS/_new 2023-03-25 18:54:11.218297159 +0100
@@ -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
