Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2021-08-19 10:00:38
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.1899 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Thu Aug 19 10:00:38 2021 rev:247 rq:912247 version:2.06
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2021-08-06
22:44:24.486110274 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.1899/grub2.changes 2021-08-19
10:00:39.531290184 +0200
@@ -1,0 +2,7 @@
+Wed Aug 4 10:28:49 UTC 2021 - Stefan Seyfried <seife+...@b1-systems.com>
+
+- update grub2-systemd-sleep.sh to fix hibernation by avoiding the
+ error "no kernelfile matching the running kernel found" on
+ usrmerged setup
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2-systemd-sleep.sh ++++++
--- /var/tmp/diff_new_pack.URgZnb/_old 2021-08-19 10:00:42.847286154 +0200
+++ /var/tmp/diff_new_pack.URgZnb/_new 2021-08-19 10:00:42.847286154 +0200
@@ -121,6 +121,8 @@
# We need this, if more than one kernel is installed. This works reasonably
# well with grub, if all kernels are named "vmlinuz-`uname -r`" and are
# located in /boot. If they are not, good luck ;-)
+# for 2021-style usrmerged kernels, the location in /usr/lib/modules/ \
+# `uname -r`/vmlinuz is resolved to match...
find-kernel-entry()
{
NEXT_BOOT=""
@@ -128,9 +130,14 @@
# DEBUG "running kernel: $RUNNING" DIAG
while [ -n "${KERNELS[$I]}" ]; do
BOOTING="${KERNELS[$I]}"
- if IMAGE=`readlink /boot/$BOOTING` && [ -e "/boot/${IMAGE##*/}"
]; then
- # DEBUG "Found kernel symlink $BOOTING => $IMAGE" INFO
- BOOTING=$IMAGE
+ if IMAGE=$(readlink /boot/"$BOOTING"); then
+ if [[ $IMAGE == */vmlinuz ]]; then # new usrmerged setup
+ BOOTING=${IMAGE%/vmlinuz} # the directory name
is what counts
+ BOOTING=${BOOTING##*/}
+ elif [ -e "/boot/${IMAGE##*/}" ]; then
+ # DEBUG "Found kernel symlink $BOOTING =>
$IMAGE" INFO
+ BOOTING=$IMAGE
+ fi
fi
BOOTING="${BOOTING#*${VMLINUZ}-}"
if [ "$RUNNING" == "$BOOTING" -a -n "${MENU_ENTRIES[$I]}" ];
then
@@ -169,8 +176,13 @@
# if there is no default entry (no menu.lst?) we fall back to
# the default of /boot/${VMLINUZ}.
[ -z "$BOOTING" ] && BOOTING="${VMLINUZ}"
- if IMAGE=`readlink /boot/$BOOTING` && [ -e "/boot/${IMAGE##*/}"
]; then
- BOOTING=$IMAGE
+ if IMAGE=$(readlink /boot/"$BOOTING"); then
+ if [[ $IMAGE == */vmlinuz ]]; then # new usrmerged setup
+ BOOTING=${IMAGE%/vmlinuz} # the directory name
is what counts
+ BOOTING=${BOOTING##*/}
+ elif [ -e "/boot/${IMAGE##*/}" ]; then
+ BOOTING=$IMAGE
+ fi
fi
BOOTING="${BOOTING#*${VMLINUZ}-}"
echo "running kernel: '$RUNNING', probably booting kernel:
'$BOOTING'"
