mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-11-24 14:32:58 +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>
58 lines
1.8 KiB
Diff
58 lines
1.8 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Andrei Borzenkov <arvidjaar@gmail.com>
|
|
Date: Tue, 21 Jun 2016 16:44:17 +0000
|
|
Subject: [PATCH] Fallback to old subvol name scheme to support old snapshot
|
|
config
|
|
|
|
Ref: bsc#953538
|
|
---
|
|
grub-core/fs/btrfs.c | 32 +++++++++++++++++++++++++++++++-
|
|
1 file changed, 31 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
|
index 162723423ca..69c30e62354 100644
|
|
--- a/grub-core/fs/btrfs.c
|
|
+++ b/grub-core/fs/btrfs.c
|
|
@@ -1240,11 +1240,41 @@ lookup_root_by_name(struct grub_btrfs_data *data, const char *path)
|
|
return GRUB_ERR_NONE;
|
|
}
|
|
|
|
+static grub_err_t
|
|
+lookup_root_by_name_fallback(struct grub_btrfs_data *data, const char *path)
|
|
+{
|
|
+ grub_err_t err;
|
|
+ grub_uint64_t tree = 0;
|
|
+ grub_uint8_t type;
|
|
+ struct grub_btrfs_key key;
|
|
+
|
|
+ err = find_path (data, path, &key, &tree, &type);
|
|
+ if (err)
|
|
+ return grub_error(GRUB_ERR_FILE_NOT_FOUND, "couldn't locate %s\n", path);
|
|
+
|
|
+ if (key.object_id != grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK) || tree == 0)
|
|
+ return grub_error(GRUB_ERR_BAD_FILE_TYPE, "%s: not a subvolume\n", path);
|
|
+
|
|
+ data->fs_tree = tree;
|
|
+ return GRUB_ERR_NONE;
|
|
+}
|
|
+
|
|
static grub_err_t
|
|
btrfs_handle_subvol(struct grub_btrfs_data *data __attribute__ ((unused)))
|
|
{
|
|
if (btrfs_default_subvol)
|
|
- return lookup_root_by_name(data, btrfs_default_subvol);
|
|
+ {
|
|
+ grub_err_t err;
|
|
+ err = lookup_root_by_name(data, btrfs_default_subvol);
|
|
+
|
|
+ /* Fallback to old schemes */
|
|
+ if (err == GRUB_ERR_FILE_NOT_FOUND)
|
|
+ {
|
|
+ err = GRUB_ERR_NONE;
|
|
+ return lookup_root_by_name_fallback(data, btrfs_default_subvol);
|
|
+ }
|
|
+ return err;
|
|
+ }
|
|
|
|
if (btrfs_default_subvolid)
|
|
return lookup_root_by_id(data, btrfs_default_subvolid);
|