9bc71d03db
- Merge changes from SLE12 - Do not pass root= when root is on nfs (bnc#894374) * modified grub2-pass-corret-root-for-nfsroot.patch * modified grub2-secureboot-provide-linuxefi-config.patch * modified grub2-secureboot-use-linuxefi-on-uefi.patch - Fix xen pvops kernel not appear on menu (bnc#895286) * modified grub2-fix-menu-in-xen-host-server.patch - Workaround grub2-once (bnc#892358) * added grub2-btrfs-workaround-grub2-once.patch * added grub2-once.service * modified grub2-once - Fix busy-loop and hang while network booting (bnc#870613) * added grub2-netboot-hang.patch - Add warning in grubenv file about editing it directly (bnc#887008) * added grub2-editenv-add-warning-message.patch - Fix broken graphics with efifb on QEMU/KVM and nomodeset (bnc#884558) * added grub2-efi-disable-video-cirrus-and-bochus.patch - Disable video support on Power (bnc#877142) * added grub2-ppc64le-disable-video.patch - Track occupied memory so it can be released on exit (bnc#885026) * added grub2-ppc64le-memory-map.patch - Fix grub.xen config searching path on boot partition (bnc#884828) - Add linux16 and initrd16 to grub.xen (bnc#884830) * added grub2-xen-linux16.patch - VLAN tag support (fate#315753) * added 0001-Add-bootargs-parser-for-open-firmware.patch * added 0002-Add-Virtual-LAN-support.patch - Use chainloader to boot xen.efi under UEFI (bnc#871857) * added grub2-efi-xen-chainload.patch - Use device part of chainloader target, if present (bnc#871857) OBS-URL: https://build.opensuse.org/request/show/295632 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=148
32 lines
1.1 KiB
Diff
32 lines
1.1 KiB
Diff
Index: grub-2.02~beta2/grub-core/loader/i386/xen.c
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/grub-core/loader/i386/xen.c
|
|
+++ grub-2.02~beta2/grub-core/loader/i386/xen.c
|
|
@@ -688,7 +688,7 @@ fail:
|
|
return grub_errno;
|
|
}
|
|
|
|
-static grub_command_t cmd_xen, cmd_initrd, cmd_module, cmd_multiboot;
|
|
+static grub_command_t cmd_xen, cmd_initrd, cmd_module, cmd_multiboot, cmd_xen16, cmd_initrd16;
|
|
|
|
GRUB_MOD_INIT (xen)
|
|
{
|
|
@@ -700,6 +700,10 @@ GRUB_MOD_INIT (xen)
|
|
0, N_("Load initrd."));
|
|
cmd_module = grub_register_command ("module", grub_cmd_module,
|
|
0, N_("Load module."));
|
|
+ cmd_xen16 = grub_register_command ("linux16", grub_cmd_xen,
|
|
+ 0, N_("Load Linux."));
|
|
+ cmd_initrd16 = grub_register_command ("initrd16", grub_cmd_initrd,
|
|
+ 0, N_("Load initrd."));
|
|
my_mod = mod;
|
|
}
|
|
|
|
@@ -709,4 +713,6 @@ GRUB_MOD_FINI (xen)
|
|
grub_unregister_command (cmd_initrd);
|
|
grub_unregister_command (cmd_multiboot);
|
|
grub_unregister_command (cmd_module);
|
|
+ grub_unregister_command (cmd_xen16);
|
|
+ grub_unregister_command (cmd_initrd16);
|
|
}
|