From db8dacab67ed2ec3bfa91c50e7f5c3095930711bd6738d4c17a6319046c22af4 Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Wed, 16 Oct 2019 04:02:48 +0000
Subject: [PATCH] Accepting request 738627 from home:rwill:branches:Base:System

Consistently find btrfs snapshots on s390x.  (bsc#1136970)

OBS-URL: https://build.opensuse.org/request/show/738627
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=339
---
 grub2-s390x-04-grub2-install.patch | 12 +++++++-----
 grub2.changes                      |  6 ++++++
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/grub2-s390x-04-grub2-install.patch b/grub2-s390x-04-grub2-install.patch
index 2c75a20..44e85d2 100644
--- a/grub2-s390x-04-grub2-install.patch
+++ b/grub2-s390x-04-grub2-install.patch
@@ -51,6 +51,8 @@ V18:
  * dracut-zipl-refresh.sh.in: initial submission.  [bsc#1127293]
  * dracut-grub2.sh: try to call zipl-refresh on failed kexec and drop
    to an emergency shell otherwise
+V19:
+ * dracut-grub2.sh: use 'grep -P' instead of '-E'.  [bsc#1136970]
 
 ---
  Makefile.util.def                      |   46 +++
@@ -494,7 +496,7 @@ V18:
 +  checksnap() {
 +    if [ -e /sysroot/.snapshots/grub-snapshot.cfg ]; then
 +      echo true
-+    elif grep  -qE '^[^#\s]+\s+/.snapshots\s+' /sysroot/etc/fstab; then
++    elif grep  -qP '^[^#\s]+\s+/.snapshots\s+' /sysroot/etc/fstab; then
 +      echo false
 +    else
 +      echo true
@@ -560,8 +562,8 @@ V18:
 +    debug "Trying grub2-emu (ro=$grub2rofs, TERM=$TERM, ctty=$_ctty)..."
 +    setsid $CTTY -- chroot /sysroot $bindir/grub2-emu -X -X 0<>$_ctty 1>&0 2>&0
 +
-+    if [ -x /sysroot/usr/share/grub2/zipl-refresh ]; then
-+	setsid $CTTY -- /sysroot/usr/share/grub2/zipl-refresh 0<>$_ctty 1>&0 2>&0
++    if [ -x /sysroot@libdir@/grub2/zipl-refresh ]; then
++	setsid $CTTY -- /sysroot@libdir@/grub2/zipl-refresh 0<>$_ctty 1>&0 2>&0
 +	if [ $? != 0 ]; then
 +	    warn "Not continuing"
 +	    emergency_shell -n grub2-emu-zipl-refresh
@@ -1075,7 +1077,7 @@ V18:
 +# ex: ts=8 sw=4 sts=4 et filetype=sh syntax=off
 +
 +debug=false
-+TIMEOUT=60
++TIMEOUT=300
 +[ -n "$SYSROOT" ] ||
 +SYSROOT=/sysroot
 +[ -d $SYSROOT/boot ] || SYSROOT=
@@ -1157,7 +1159,7 @@ V18:
 +  to be made writable, then 'grub2-install --force' needs to be run,
 +  and, on success, a 'reboot' will be initiated.
 +
-+  Press 'c[Enter]' to interrupt... "
++  Press 'c[Enter]' to interrupt, any other input will proceed... "
 +
 +trap interrupted=1 INT
 +interrupted=0
diff --git a/grub2.changes b/grub2.changes
index e15ff15..3e78162 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 15 13:29:14 UTC 2019 - rw@suse.com
+
+- Consistently find btrfs snapshots on s390x.  (bsc#1136970)
+  * grub2-s390x-04-grub2-install.patch
+
 -------------------------------------------------------------------
 Fri Aug 16 04:51:16 UTC 2019 - Michael Chang <mchang@suse.com>