Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
openSUSE:Leap:15.5:Update
grub2.19065
grub2-efi-xen-removable.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File grub2-efi-xen-removable.patch of Package grub2.19065
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. Index: grub-2.02/util/grub.d/20_linux_xen.in =================================================================== --- grub-2.02.orig/util/grub.d/20_linux_xen.in +++ grub-2.02/util/grub.d/20_linux_xen.in @@ -91,31 +91,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/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 ' @@ -223,10 +198,15 @@ linux_entry () kernel=${basename} root=${linux_root_device_thisversion} ${args_unq} ramdisk=${initrd} 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}; do @@ -307,6 +287,7 @@ else done fi prepare_boot_cache= +prepare_efi_cache= boot_device_id= title_correction_code= @@ -327,6 +308,33 @@ 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/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`
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor