From d4f499662c7dcb18e53dc4584681fd47c157413a90819eebceadead1a07fe103 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Wed, 30 Oct 2019 04:56:08 +0000 Subject: [PATCH] Accepting request 743474 from home:bmwiedemann:branches:Base:System Fix grub2.sleep to load old kernel after hibernation (boo#1154783) OBS-URL: https://build.opensuse.org/request/show/743474 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=342 --- grub2-systemd-sleep.sh | 2 +- grub2.changes | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/grub2-systemd-sleep.sh b/grub2-systemd-sleep.sh index 4cb7bbb..8811803 100644 --- a/grub2-systemd-sleep.sh +++ b/grub2-systemd-sleep.sh @@ -201,7 +201,7 @@ check-setup() { local WANT="$VMLINUZ-$1" - [ -n "$GRUB_SETUP" ] || return + [ -n "$GRUB_SETUP" ] || return 0 # implementation below is s390x-only (for now) echo "INFO: check-setup \"$WANT\" .." HAVE="/boot/zipl/$VMLINUZ" diff --git a/grub2.changes b/grub2.changes index 04e3484..1e1f7bf 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 28 11:52:19 UTC 2019 - Bernhard Wiedemann + +- Fix grub2.sleep to load old kernel after hibernation (boo#1154783) + ------------------------------------------------------------------- Tue Oct 22 08:05:19 UTC 2019 - Andreas Schwab