ef0ef13ff0
- Fix inappropriately including commented lines in crypttab (bsc#1206279) * 0010-templates-import-etc-crypttab-to-grub.cfg.patch - Make grub.cfg invariant to efi and legacy platforms (bsc#1205200) - Removed patch linuxefi * grub2-secureboot-provide-linuxefi-config.patch * grub2-secureboot-use-linuxefi-on-uefi-in-os-prober.patch * grub2-secureboot-use-linuxefi-on-uefi.patch - Rediff * grub2-btrfs-05-grub2-mkconfig.patch * grub2-efi-xen-cmdline.patch * grub2-s390x-05-grub2-mkconfig.patch * grub2-suse-remove-linux-root-param.patch OBS-URL: https://build.opensuse.org/request/show/1045798 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=434
24 lines
871 B
Diff
24 lines
871 B
Diff
--- a/util/grub-mkconfig.in
|
|
+++ b/util/grub-mkconfig.in
|
|
@@ -295,7 +295,8 @@
|
|
GRUB_OS_PROBER_SKIP_LIST \
|
|
GRUB_DISABLE_SUBMENU \
|
|
GRUB_CMDLINE_LINUX_RECOVERY \
|
|
- SUSE_BTRFS_SNAPSHOT_BOOTING
|
|
+ SUSE_BTRFS_SNAPSHOT_BOOTING \
|
|
+ SUSE_CMDLINE_XENEFI
|
|
|
|
if test "x${grub_cfg}" != "x"; then
|
|
rm -f "${grub_cfg}.new"
|
|
--- a/util/grub.d/20_linux_xen.in
|
|
+++ b/util/grub.d/20_linux_xen.in
|
|
@@ -216,7 +216,7 @@
|
|
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_real}; do
|