From 421a84e36ccb36f70a881d90256f729529a73b65fb080dec734d2c301375204b Mon Sep 17 00:00:00 2001
From: Michael Chang <mchang@suse.com>
Date: Tue, 10 Dec 2019 06:30:43 +0000
Subject: [PATCH] Accepting request 755261 from home:olh:ai

- Correct awk pattern in 20_linux_xen (bsc#900418, bsc#1157912)
- Correct linux and initrd handling in 20_linux_xen (bsc#1157912)
  M grub2-efi-xen-cfg-unquote.patch
  M grub2-efi-xen-chainload.patch
  M grub2-efi-xen-cmdline.patch
  M grub2-efi-xen-removable.patch

OBS-URL: https://build.opensuse.org/request/show/755261
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=344
---
 grub2-efi-xen-cfg-unquote.patch |  4 ++--
 grub2-efi-xen-chainload.patch   |  4 ++--
 grub2-efi-xen-cmdline.patch     |  2 +-
 grub2-efi-xen-removable.patch   |  4 ++--
 grub2.changes                   | 10 ++++++++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/grub2-efi-xen-cfg-unquote.patch b/grub2-efi-xen-cfg-unquote.patch
index 907e2f5..dd37de6 100644
--- a/grub2-efi-xen-cfg-unquote.patch
+++ b/grub2-efi-xen-cfg-unquote.patch
@@ -44,7 +44,7 @@ Index: grub-2.02~rc1/util/grub.d/20_linux_xen.in
 +      print sep[0]
 +      for (i in words) {
 +        w = words[i]
-+        if (w ~ /^\$?\"/) {
++        if (w ~ /^\$?"/) {
 +          # Double-quoted string
 +          patsplit(w, segs, var"|"dqesc, ssep)
 +          print ssep[0]
@@ -87,6 +87,6 @@ Index: grub-2.02~rc1/util/grub.d/20_linux_xen.in
 -	kernel=${basename} root=${linux_root_device_thisversion} ${args}
 +	options=${xen_args_unq}
 +	kernel=${basename} root=${linux_root_device_thisversion} ${args_unq}
- 	ramdisk=${initrd}
+ 	ramdisk=${initrd_real}
  	EOF
      message="$(gettext_printf "Loading Xen %s with Linux %s ..." ${xen_version} ${version})"
diff --git a/grub2-efi-xen-chainload.patch b/grub2-efi-xen-chainload.patch
index beb18f2..480bb50 100644
--- a/grub2-efi-xen-chainload.patch
+++ b/grub2-efi-xen-chainload.patch
@@ -119,7 +119,7 @@ V3:
 +	[$section]
 +	options=${xen_args}
 +	kernel=${basename} root=${linux_root_device_thisversion} ${args}
-+	ramdisk=${initrd}
++	ramdisk=${initrd_real}
 +	EOF
 +    message="$(gettext_printf "Loading Xen %s with Linux %s ..." ${xen_version} ${version})"
 +    sed "s/^/$submenu_indentation/" <<-EOF
@@ -127,7 +127,7 @@ V3:
 +	 	chainloader  \$cmdpath/${xen_basename} ${xen_basename} $section
 +	}
 +	EOF
-+    for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} ${dirname}/${basename} ${dirname}/${initrd}; do
++    for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} ${dirname}/${basename} ${dirname}/${initrd_real}; do
 +      cp --preserve=timestamps $f $efi_dir
 +      echo $(basename $f) >> $efi_dir/grub.xen-files
 +    done
diff --git a/grub2-efi-xen-cmdline.patch b/grub2-efi-xen-cmdline.patch
index d3342f1..f94ade1 100644
--- a/grub2-efi-xen-cmdline.patch
+++ b/grub2-efi-xen-cmdline.patch
@@ -24,4 +24,4 @@ Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
 +	 	chainloader  \$cmdpath/${xen_basename} ${xen_basename} ${SUSE_CMDLINE_XENEFI} $section
  	}
  	EOF
-     for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} ${dirname}/${basename} ${dirname}/${initrd}; do
+     for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} ${dirname}/${basename} ${dirname}/${initrd_real}; do
diff --git a/grub2-efi-xen-removable.patch b/grub2-efi-xen-removable.patch
index 5bfc2dd..791c7b4 100644
--- a/grub2-efi-xen-removable.patch
+++ b/grub2-efi-xen-removable.patch
@@ -57,7 +57,7 @@ $cmdpath to work.
    awk '
 @@ -234,10 +208,15 @@ linux_entry ()
  	kernel=${basename} root=${linux_root_device_thisversion} ${args_unq}
- 	ramdisk=${initrd}
+ 	ramdisk=${initrd_real}
  	EOF
 +    if [ -z "${prepare_efi_cache}" ]; then
 +      grub_device_efi="`${grub_probe} --target=device /boot/efi`"
@@ -71,7 +71,7 @@ $cmdpath to work.
 +	 	chainloader  ${rel_efi_dir}/${xen_basename} ${xen_basename} ${SUSE_CMDLINE_XENEFI} $section
  	}
  	EOF
-     for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} ${dirname}/${basename} ${dirname}/${initrd}; do
+     for f in ${grub_dir}/$xen_cfg ${xen_dir}/${xen_basename} ${dirname}/${basename} ${dirname}/${initrd_real}; do
 @@ -318,6 +297,7 @@ else
      done
  fi
diff --git a/grub2.changes b/grub2.changes
index 27466d0..959a081 100644
--- a/grub2.changes
+++ b/grub2.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Wed Nov 27 17:09:42 UTC 2019 - olaf@aepfle.de
+
+- Correct awk pattern in 20_linux_xen (bsc#900418, bsc#1157912)
+- Correct linux and initrd handling in 20_linux_xen (bsc#1157912)
+  M grub2-efi-xen-cfg-unquote.patch
+  M grub2-efi-xen-chainload.patch
+  M grub2-efi-xen-cmdline.patch
+  M grub2-efi-xen-removable.patch
+
 -------------------------------------------------------------------
 Wed Oct 30 06:26:33 UTC 2019 - Michael Chang <mchang@suse.com>