SHA256
1
0
forked from pool/grub2

Accepting request 357503 from home:michael-chang:branches:Base:System

- Add config option to set efi xen loader command line option (bsc#957383)
  * added grub2-efi-xen-cmdline.patch

OBS-URL: https://build.opensuse.org/request/show/357503
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=203
This commit is contained in:
Andrei Borzenkov 2016-02-03 17:39:22 +00:00 committed by Git OBS Bridge
parent eafb269f9e
commit 5cb1d7f770
4 changed files with 46 additions and 9 deletions

View File

@ -50,7 +50,7 @@ Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
fi fi
# loop-AES arranges things so that /dev/loop/X can be our root device, but # loop-AES arranges things so that /dev/loop/X can be our root device, but
@@ -81,6 +85,31 @@ esac @@ -85,6 +89,31 @@ esac
title_correction_code= title_correction_code=
@ -82,7 +82,7 @@ Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
linux_entry () linux_entry ()
{ {
os="$1" os="$1"
@@ -118,6 +147,40 @@ linux_entry () @@ -122,6 +151,40 @@ linux_entry ()
save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/" save_default_entry | grub_add_tab | sed "s/^/$submenu_indentation/"
fi fi
@ -123,7 +123,7 @@ Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
if [ -z "${prepare_boot_cache}" ]; then if [ -z "${prepare_boot_cache}" ]; then
prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)" prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | grub_add_tab)"
fi fi
@@ -225,6 +288,24 @@ while [ "x${xen_list}" != "x" ] ; do @@ -219,6 +282,24 @@ while [ "x${xen_list}" != "x" ] ; do
xen_dirname=`dirname ${current_xen}` xen_dirname=`dirname ${current_xen}`
rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname` rel_xen_dirname=`make_system_path_relative_to_its_root $xen_dirname`
xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"` xen_version=`echo $xen_basename | sed -e "s,.gz$,,g;s,^xen-,,g"`
@ -148,7 +148,7 @@ Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
if [ -z "$boot_device_id" ]; then if [ -z "$boot_device_id" ]; then
boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")" boot_device_id="$(grub_get_device_id "${GRUB_DEVICE}")"
fi fi
@@ -289,7 +370,6 @@ while [ "x${xen_list}" != "x" ] ; do @@ -283,7 +364,6 @@ while [ "x${xen_list}" != "x" ] ; do
if [ x"$is_top_level" != xtrue ]; then if [ x"$is_top_level" != xtrue ]; then
echo ' }' echo ' }'
fi fi
@ -156,7 +156,7 @@ Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
done done
# If at least one kernel was found, then we need to # If at least one kernel was found, then we need to
@@ -299,3 +379,7 @@ if [ x"$is_top_level" != xtrue ]; then @@ -293,3 +373,7 @@ if [ x"$is_top_level" != xtrue ]; then
fi fi
echo "$title_correction_code" echo "$title_correction_code"

View File

@ -0,0 +1,27 @@
Index: grub-2.02~beta2/util/grub-mkconfig.in
===================================================================
--- grub-2.02~beta2.orig/util/grub-mkconfig.in
+++ grub-2.02~beta2/util/grub-mkconfig.in
@@ -260,7 +260,8 @@ export GRUB_DEFAULT \
GRUB_DISABLE_SUBMENU \
GRUB_CMDLINE_LINUX_RECOVERY \
GRUB_USE_LINUXEFI \
- SUSE_BTRFS_SNAPSHOT_BOOTING
+ SUSE_BTRFS_SNAPSHOT_BOOTING \
+ SUSE_CMDLINE_XENEFI
if test "x${grub_cfg}" != "x"; then
rm -f "${grub_cfg}.new"
Index: grub-2.02~beta2/util/grub.d/20_linux_xen.in
===================================================================
--- grub-2.02~beta2.orig/util/grub.d/20_linux_xen.in
+++ grub-2.02~beta2/util/grub.d/20_linux_xen.in
@@ -176,7 +176,7 @@ linux_entry ()
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} $section
+ 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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Jan 29 03:54:15 UTC 2016 - mchang@suse.com
- Add config option to set efi xen loader command line option (bsc#957383)
* added grub2-efi-xen-cmdline.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jan 28 12:27:27 UTC 2016 - dvaleev@suse.com Thu Jan 28 12:27:27 UTC 2016 - dvaleev@suse.com

View File

@ -186,8 +186,6 @@ Patch48: 0001-efinet-enable-hardware-filters-when-opening-interfac.patch
Patch51: grub2-xen-legacy-config-device-name.patch Patch51: grub2-xen-legacy-config-device-name.patch
Patch52: grub2-getroot-support-NVMe-device-names.patch Patch52: grub2-getroot-support-NVMe-device-names.patch
Patch53: grub2-getroot-treat-mdadm-ddf-as-simple-device.patch Patch53: grub2-getroot-treat-mdadm-ddf-as-simple-device.patch
Patch54: grub2-efi-xen-chainload.patch
Patch55: grub2-efi-chainloader-root.patch
Patch56: grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch Patch56: grub2-setup-try-fs-embed-if-mbr-gap-too-small.patch
Patch57: grub2-netboot-hang.patch Patch57: grub2-netboot-hang.patch
Patch58: grub2-xen-linux16.patch Patch58: grub2-xen-linux16.patch
@ -214,6 +212,11 @@ Patch103: grub2-btrfs-03-follow_default.patch
Patch104: grub2-btrfs-04-grub2-install.patch Patch104: grub2-btrfs-04-grub2-install.patch
Patch105: grub2-btrfs-05-grub2-mkconfig.patch Patch105: grub2-btrfs-05-grub2-mkconfig.patch
Patch106: grub2-btrfs-06-subvol-mount.patch Patch106: grub2-btrfs-06-subvol-mount.patch
# Support EFI xen loader
Patch120: grub2-efi-xen-chainload.patch
Patch121: grub2-efi-chainloader-root.patch
Patch122: grub2-efi-xen-cmdline.patch
# PPC64 LE support
Patch201: ppc64le.patch Patch201: ppc64le.patch
Patch202: libgcc-prereq.patch Patch202: libgcc-prereq.patch
Patch203: libgcc.patch Patch203: libgcc.patch
@ -449,8 +452,6 @@ mv po/grub.pot po/%{name}.pot
%patch51 -p1 %patch51 -p1
%patch52 -p1 %patch52 -p1
%patch53 -p1 %patch53 -p1
%patch54 -p1
%patch55 -p1
%patch56 -p1 %patch56 -p1
%patch57 -p1 %patch57 -p1
%patch58 -p1 %patch58 -p1
@ -475,6 +476,9 @@ mv po/grub.pot po/%{name}.pot
%patch104 -p1 %patch104 -p1
%patch105 -p1 %patch105 -p1
%patch106 -p1 %patch106 -p1
%patch120 -p1
%patch121 -p1
%patch122 -p1
%patch201 -p1 %patch201 -p1
%patch202 -p1 %patch202 -p1
%patch203 -p1 %patch203 -p1