Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2019-12-23 22:34:50
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.6675 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Mon Dec 23 22:34:50 2019 rev:213 rq:755447 version:2.04
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2019-11-03
11:24:43.328902797 +0100
+++ /work/SRC/openSUSE:Factory/.grub2.new.6675/grub2.changes 2019-12-23
22:36:01.741783484 +0100
@@ -1,0 +2,10 @@
+Wed Nov 27 17:09:42 UTC 2019 - o...@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
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2-efi-xen-cfg-unquote.patch ++++++
--- /var/tmp/diff_new_pack.ou7zQx/_old 2019-12-23 22:36:03.405784206 +0100
+++ /var/tmp/diff_new_pack.ou7zQx/_new 2019-12-23 22:36:03.409784208 +0100
@@ -44,7 +44,7 @@
+ 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 @@
- 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})"
++++++ grub2-efi-xen-chainload.patch ++++++
--- /var/tmp/diff_new_pack.ou7zQx/_old 2019-12-23 22:36:03.413784209 +0100
+++ /var/tmp/diff_new_pack.ou7zQx/_new 2019-12-23 22:36:03.413784209 +0100
@@ -119,7 +119,7 @@
+ [$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 @@
+ 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
++++++ grub2-efi-xen-cmdline.patch ++++++
--- /var/tmp/diff_new_pack.ou7zQx/_old 2019-12-23 22:36:03.421784212 +0100
+++ /var/tmp/diff_new_pack.ou7zQx/_new 2019-12-23 22:36:03.421784212 +0100
@@ -24,4 +24,4 @@
+ 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
++++++ grub2-efi-xen-removable.patch ++++++
--- /var/tmp/diff_new_pack.ou7zQx/_old 2019-12-23 22:36:03.429784217 +0100
+++ /var/tmp/diff_new_pack.ou7zQx/_new 2019-12-23 22:36:03.429784217 +0100
@@ -57,7 +57,7 @@
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 @@
+ 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
