e1531466e1
This change updates grub to the 2.04 release. The new release changed how grub is built, so the bootstrap and bootstrap.conf files have to be added to the dist-git. Also, the gitignore file changed so it has to be updated. Since the patches have been forward ported to 2.04, there's no need for a logic to maintain a patch with the delta between the release and the grub master branch. So the release-to-master.patch is dropped and no longer is updated by the do-rebase script. Also since gnulib isn't part of the grub repository anymore and cloned by the boostrap tool, a gnulib tarball is included as other source file and copied before calling the bootstrap tool. That way grub can be built even in builders that only have access to the sources lookaside cache. Resolves: rhbz#1727279 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
105 lines
2.9 KiB
Diff
105 lines
2.9 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Peter Jones <pjones@redhat.com>
|
|
Date: Wed, 3 Sep 2014 10:38:00 -0400
|
|
Subject: [PATCH] Make editenv chase symlinks including those across devices.
|
|
|
|
This lets us make /boot/grub2/grubenv a symlink to
|
|
/boot/efi/EFI/fedora/grubenv even though they're different mount points,
|
|
which allows /usr/bin/grub2-editenv to be the same across platforms
|
|
(i.e. UEFI vs BIOS).
|
|
|
|
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
Reviewed-by: Adam Jackson <ajax@redhat.com>
|
|
---
|
|
Makefile.util.def | 11 +++++++++++
|
|
util/editenv.c | 46 ++++++++++++++++++++++++++++++++++++++++++++--
|
|
2 files changed, 55 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/Makefile.util.def b/Makefile.util.def
|
|
index 8717774d510..1f298d05f3d 100644
|
|
--- a/Makefile.util.def
|
|
+++ b/Makefile.util.def
|
|
@@ -240,8 +240,19 @@ program = {
|
|
|
|
common = util/grub-editenv.c;
|
|
common = util/editenv.c;
|
|
+ common = util/grub-install-common.c;
|
|
common = grub-core/osdep/init.c;
|
|
+ common = grub-core/osdep/compress.c;
|
|
+ extra_dist = grub-core/osdep/unix/compress.c;
|
|
+ extra_dist = grub-core/osdep/basic/compress.c;
|
|
+ common = util/mkimage.c;
|
|
+ common = util/grub-mkimage32.c;
|
|
+ common = util/grub-mkimage64.c;
|
|
+ common = grub-core/osdep/config.c;
|
|
+ common = util/config.c;
|
|
+ common = util/resolve.c;
|
|
|
|
+ ldadd = '$(LIBLZMA)';
|
|
ldadd = libgrubmods.a;
|
|
ldadd = libgrubgcry.a;
|
|
ldadd = libgrubkern.a;
|
|
diff --git a/util/editenv.c b/util/editenv.c
|
|
index eb2d0c03a98..e61dc1283a4 100644
|
|
--- a/util/editenv.c
|
|
+++ b/util/editenv.c
|
|
@@ -37,6 +37,7 @@ grub_util_create_envblk_file (const char *name)
|
|
FILE *fp;
|
|
char *buf;
|
|
char *namenew;
|
|
+ char *rename_target = xstrdup(name);
|
|
|
|
buf = xmalloc (DEFAULT_ENVBLK_SIZE);
|
|
|
|
@@ -60,7 +61,48 @@ grub_util_create_envblk_file (const char *name)
|
|
free (buf);
|
|
fclose (fp);
|
|
|
|
- if (grub_util_rename (namenew, name) < 0)
|
|
- grub_util_error (_("cannot rename the file %s to %s"), namenew, name);
|
|
+ ssize_t size = 1;
|
|
+ while (1)
|
|
+ {
|
|
+ char *linkbuf;
|
|
+ ssize_t retsize;
|
|
+
|
|
+ linkbuf = xmalloc(size+1);
|
|
+ retsize = grub_util_readlink (rename_target, linkbuf, size);
|
|
+ if (retsize < 0 && (errno == ENOENT || errno == EINVAL))
|
|
+ {
|
|
+ free (linkbuf);
|
|
+ break;
|
|
+ }
|
|
+ else if (retsize < 0)
|
|
+ {
|
|
+ grub_util_error (_("cannot rename the file %s to %s: %m"), namenew, name);
|
|
+ free (linkbuf);
|
|
+ free (namenew);
|
|
+ return;
|
|
+ }
|
|
+ else if (retsize == size)
|
|
+ {
|
|
+ free(linkbuf);
|
|
+ size += 128;
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ free (rename_target);
|
|
+ linkbuf[retsize] = '\0';
|
|
+ rename_target = linkbuf;
|
|
+ }
|
|
+
|
|
+ int rc = grub_util_rename (namenew, rename_target);
|
|
+ if (rc < 0 && errno == EXDEV)
|
|
+ {
|
|
+ rc = grub_install_copy_file (namenew, rename_target, 1);
|
|
+ grub_util_unlink (namenew);
|
|
+ }
|
|
+
|
|
+ if (rc < 0)
|
|
+ grub_util_error (_("cannot rename the file %s to %s: %m"), namenew, name);
|
|
+
|
|
free (namenew);
|
|
+ free (rename_target);
|
|
}
|