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
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
Index: grub-2.02~beta2/util/editenv.c
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/util/editenv.c
|
|
+++ grub-2.02~beta2/util/editenv.c
|
|
@@ -30,12 +30,14 @@
|
|
#include <string.h>
|
|
|
|
#define DEFAULT_ENVBLK_SIZE 1024
|
|
+#define GRUB_ENVBLK_MESSAGE "# WARNING: Do not edit this file other than by grub2-editenv\n"
|
|
|
|
void
|
|
grub_util_create_envblk_file (const char *name)
|
|
{
|
|
FILE *fp;
|
|
char *buf;
|
|
+ char *pbuf;
|
|
char *namenew;
|
|
|
|
buf = xmalloc (DEFAULT_ENVBLK_SIZE);
|
|
@@ -46,9 +48,13 @@ grub_util_create_envblk_file (const char
|
|
grub_util_error (_("cannot open `%s': %s"), namenew,
|
|
strerror (errno));
|
|
|
|
- memcpy (buf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);
|
|
- memset (buf + sizeof (GRUB_ENVBLK_SIGNATURE) - 1, '#',
|
|
- DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) + 1);
|
|
+ pbuf = buf;
|
|
+ memcpy (pbuf, GRUB_ENVBLK_SIGNATURE, sizeof (GRUB_ENVBLK_SIGNATURE) - 1);
|
|
+ pbuf += sizeof (GRUB_ENVBLK_SIGNATURE) - 1;
|
|
+ memcpy (pbuf, GRUB_ENVBLK_MESSAGE, sizeof (GRUB_ENVBLK_MESSAGE) - 1);
|
|
+ pbuf += sizeof (GRUB_ENVBLK_MESSAGE) - 1;
|
|
+ memset (pbuf , '#',
|
|
+ DEFAULT_ENVBLK_SIZE - sizeof (GRUB_ENVBLK_SIGNATURE) - sizeof (GRUB_ENVBLK_MESSAGE) + 2);
|
|
|
|
if (fwrite (buf, 1, DEFAULT_ENVBLK_SIZE, fp) != DEFAULT_ENVBLK_SIZE)
|
|
grub_util_error (_("cannot write to `%s': %s"), namenew,
|