pool/grub2
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 755261 from home:olh:ai

Browse Source 
- 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
This commit is contained in:
Michael Chang 2019-12-10 06:30:43 +00:00 committed by Git OBS Bridge
parent 5d1d201c64
commit 421a84e36c
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
grub2-efi-xen-cfg-unquote.patch
View File

@ -44,7 +44,7 @@ Index: grub-2.02~rc1/util/grub.d/20_linux_xen.in
+ print sep[0] + print sep[0]
+ for (i in words) { + for (i in words) {
+ w = words[i] + w = words[i]
+ if (w ~ /^\$?\"/) { + if (w ~ /^\$?"/) {
+ # Double-quoted string + # Double-quoted string
+ patsplit(w, segs, var"|"dqesc, ssep) + patsplit(w, segs, var"|"dqesc, ssep)
+ print ssep[0] + 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} - kernel=${basename} root=${linux_root_device_thisversion} ${args}
+ options=${xen_args_unq} + options=${xen_args_unq}
+ kernel=${basename} root=${linux_root_device_thisversion} ${args_unq} + kernel=${basename} root=${linux_root_device_thisversion} ${args_unq}
ramdisk=${initrd} ramdisk=${initrd_real}
EOF EOF
message="$(gettext_printf "Loading Xen %s with Linux %s ..." ${xen_version} ${version})" message="$(gettext_printf "Loading Xen %s with Linux %s ..." ${xen_version} ${version})"

4
grub2-efi-xen-chainload.patch
View File

@ -119,7 +119,7 @@ V3:
+ [$section] + [$section]
+ options=${xen_args} + options=${xen_args}
+ kernel=${basename} root=${linux_root_device_thisversion} ${args} + kernel=${basename} root=${linux_root_device_thisversion} ${args}
+ ramdisk=${initrd} + ramdisk=${initrd_real}
+ EOF + EOF
+ message="$(gettext_printf "Loading Xen %s with Linux %s ..." ${xen_version} ${version})" + message="$(gettext_printf "Loading Xen %s with Linux %s ..." ${xen_version} ${version})"
+ sed "s/^/$submenu_indentation/" <<-EOF + sed "s/^/$submenu_indentation/" <<-EOF
@ -127,7 +127,7 @@ V3:
+ chainloader \$cmdpath/${xen_basename} ${xen_basename} $section + chainloader \$cmdpath/${xen_basename} ${xen_basename} $section
+ } + }
+ EOF + 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 + cp --preserve=timestamps $f $efi_dir
+ echo $(basename $f) >> $efi_dir/grub.xen-files + echo $(basename $f) >> $efi_dir/grub.xen-files
+ done + done

2
grub2-efi-xen-cmdline.patch
View File

@ -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 + chainloader \$cmdpath/${xen_basename} ${xen_basename} ${SUSE_CMDLINE_XENEFI} $section
} }
EOF 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

4
grub2-efi-xen-removable.patch
View File

@ -57,7 +57,7 @@ $cmdpath to work.
awk ' awk '
@@ -234,10 +208,15 @@ linux_entry () @@ -234,10 +208,15 @@ linux_entry ()
kernel=${basename} root=${linux_root_device_thisversion} ${args_unq} kernel=${basename} root=${linux_root_device_thisversion} ${args_unq}
ramdisk=${initrd} ramdisk=${initrd_real}
EOF EOF
+ if [ -z "${prepare_efi_cache}" ]; then + if [ -z "${prepare_efi_cache}" ]; then
+ grub_device_efi="`${grub_probe} --target=device /boot/efi`" + 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 + chainloader ${rel_efi_dir}/${xen_basename} ${xen_basename} ${SUSE_CMDLINE_XENEFI} $section
} }
EOF 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 @@ -318,6 +297,7 @@ else
done done
fi fi

10
grub2.changes
View File

@ -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> Wed Oct 30 06:26:33 UTC 2019 - Michael Chang <mchang@suse.com>