mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-27 23:34:51 +00:00
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>
50 lines
1.3 KiB
Diff
50 lines
1.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jonathan Lebon <jlebon@redhat.com>
|
|
Date: Mon, 14 Aug 2017 14:37:20 -0400
|
|
Subject: [PATCH] editenv: handle relative symlinks
|
|
|
|
Handle symlinks with targets relative to the containing dir. This
|
|
ensures that the rename operation does not depend on the cwd.
|
|
|
|
Resolves: rhbz#1479960
|
|
|
|
Signed-off-by: Jonathan Lebon <jlebon@redhat.com>
|
|
---
|
|
util/editenv.c | 16 ++++++++++++++--
|
|
1 file changed, 14 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/util/editenv.c b/util/editenv.c
|
|
index e61dc1283a4..1f7f6f3ae18 100644
|
|
--- a/util/editenv.c
|
|
+++ b/util/editenv.c
|
|
@@ -28,6 +28,7 @@
|
|
|
|
#include <errno.h>
|
|
#include <string.h>
|
|
+#include <libgen.h>
|
|
|
|
#define DEFAULT_ENVBLK_SIZE 1024
|
|
|
|
@@ -88,9 +89,20 @@ grub_util_create_envblk_file (const char *name)
|
|
continue;
|
|
}
|
|
|
|
- free (rename_target);
|
|
linkbuf[retsize] = '\0';
|
|
- rename_target = linkbuf;
|
|
+ if (linkbuf[0] == '/')
|
|
+ {
|
|
+ free (rename_target);
|
|
+ rename_target = linkbuf;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ char *dbuf = xstrdup (rename_target);
|
|
+ const char *dir = dirname (dbuf);
|
|
+ free (rename_target);
|
|
+ rename_target = xasprintf("%s/%s", dir, linkbuf);
|
|
+ free (dbuf);
|
|
+ }
|
|
}
|
|
|
|
int rc = grub_util_rename (namenew, rename_target);
|