421a84e36c
- 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
118 lines
3.8 KiB
Diff
118 lines
3.8 KiB
Diff
From: Michael Chang <mchang@suse.com>
|
|
References: bsc#1085842
|
|
Patch-Mainline: no
|
|
|
|
The grub can be installed with removable option to support booting from
|
|
removable media with standard UEFI default file path of the form:
|
|
\EFI\BOOT\BOOT{machine type short-name}.EFI
|
|
|
|
It does not make use of distributor directory, which becomes a problem for UEFI
|
|
Xen installation as it requires that directory to be present for storing xen
|
|
stuff like chainloaded hypervisor, xen kernel and so on. Moreover it makes bad
|
|
assumption that hypervisor will be chainloaded by grub under the same
|
|
directory, which is also not always true.
|
|
|
|
This patch fixes the problem by ensuring the directory available to Xen
|
|
installation if any Xen hypervisor found and independent to grub boot path
|
|
$cmdpath to work.
|
|
|
|
---
|
|
util/grub.d/20_linux_xen.in | 62 ++++++++++++++++++++++++--------------------
|
|
1 file changed, 35 insertions(+), 27 deletions(-)
|
|
|
|
--- a/util/grub.d/20_linux_xen.in
|
|
+++ b/util/grub.d/20_linux_xen.in
|
|
@@ -101,32 +101,6 @@ esac
|
|
|
|
title_correction_code=
|
|
|
|
-if [ -d /sys/firmware/efi ]; then
|
|
- is_efi=true
|
|
- err_msg=""
|
|
- efi_dir="/boot/efi/efi/${os}"
|
|
- grub_dir=/boot/@PACKAGE@
|
|
- xen_dir=/usr/share/efi/$machine
|
|
- [ -d $xen_dir ] || xen_dir=/usr/lib64/efi
|
|
- for d in $grub_dir $efi_dir $xen_dir; do
|
|
- [ ! -d "$d" ] || continue
|
|
- err_msg="${err_msg}$ME: Essential directory '$d' not found!\n"
|
|
- done
|
|
- if ! [ -d "$efi_dir" -a -d "$grub_dir" -a -d "$xen_dir" ]; then
|
|
- err_msg="${err_msg}$ME: XEN configuration skipped!\n"
|
|
- else
|
|
- rm -f $grub_dir/xen*.cfg
|
|
- if [ -s $efi_dir/grub.xen-files ]; then
|
|
- for f in $(sort $efi_dir/grub.xen-files| uniq); do
|
|
- rm -f $efi_dir/$f
|
|
- done
|
|
- : > $efi_dir/grub.xen-files
|
|
- fi
|
|
- fi
|
|
-else
|
|
- is_efi=false
|
|
-fi
|
|
-
|
|
grub2_unquote ()
|
|
{
|
|
awk '
|
|
@@ -234,10 +208,15 @@ linux_entry ()
|
|
kernel=${basename} root=${linux_root_device_thisversion} ${args_unq}
|
|
ramdisk=${initrd_real}
|
|
EOF
|
|
+ if [ -z "${prepare_efi_cache}" ]; then
|
|
+ grub_device_efi="`${grub_probe} --target=device /boot/efi`"
|
|
+ prepare_efi_cache="$(prepare_grub_to_access_device ${grub_device_efi} | grub_add_tab)"
|
|
+ fi
|
|
+ printf '%s\n' "${prepare_efi_cache}" | sed "s/^/$submenu_indentation/"
|
|
message="$(gettext_printf "Loading Xen %s with Linux %s ..." ${xen_version} ${version})"
|
|
sed "s/^/$submenu_indentation/" <<-EOF
|
|
echo '$(echo "$message" | grub_quote)'
|
|
- chainloader \$cmdpath/${xen_basename} ${xen_basename} ${SUSE_CMDLINE_XENEFI} $section
|
|
+ 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_real}; do
|
|
@@ -318,6 +297,7 @@ else
|
|
done
|
|
fi
|
|
prepare_boot_cache=
|
|
+prepare_efi_cache=
|
|
boot_device_id=
|
|
|
|
title_correction_code=
|
|
@@ -328,6 +308,34 @@ submenu_indentation=""
|
|
|
|
is_top_level=true
|
|
|
|
+if [ -d /sys/firmware/efi ] && [ "x${xen_list}" != "x" ]; then
|
|
+ is_efi=true
|
|
+ err_msg=""
|
|
+ efi_dir="/boot/efi/efi/${os}"
|
|
+ grub_dir=/boot/grub2
|
|
+ xen_dir=/usr/share/efi/$machine
|
|
+ [ -d $xen_dir ] || xen_dir=/usr/lib64/efi
|
|
+ for d in $grub_dir $xen_dir; do
|
|
+ [ ! -d "$d" ] || continue
|
|
+ err_msg="${err_msg}$ME: Essential directory '$d' not found!\n"
|
|
+ done
|
|
+ if ! [ -d "$grub_dir" -a -d "$xen_dir" ]; then
|
|
+ err_msg="${err_msg}$ME: XEN configuration skipped!\n"
|
|
+ else
|
|
+ mkdir -p $efi_dir
|
|
+ rel_efi_dir=`make_system_path_relative_to_its_root $efi_dir`
|
|
+ rm -f $grub_dir/xen*.cfg
|
|
+ if [ -s $efi_dir/grub.xen-files ]; then
|
|
+ for f in $(sort $efi_dir/grub.xen-files| uniq); do
|
|
+ rm -f $efi_dir/$f
|
|
+ done
|
|
+ : > $efi_dir/grub.xen-files
|
|
+ fi
|
|
+ fi
|
|
+else
|
|
+ is_efi=false
|
|
+fi
|
|
+
|
|
while [ "x${xen_list}" != "x" ] ; do
|
|
list="${linux_list}"
|
|
current_xen=`version_find_latest $xen_list`
|