forked from pool/grub2
b05b350108
- snapper rollback support (fate#317062) * add btrfs_follow_default.patch * add suse_btrfs_grub2_install.sh * add 80_suse_btrfs_snapshot * refresh grub2-snapper-plugin.sh - add grub2-x86_64-xen subpackage (bnc#863821) - ieee1275: check for IBM pseries emulated machine (bnc#869964) - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Build ppc64 as 32bit - added patches: * grub2-ppc64-build-ppc64-32bit.patch - Rename PowerPC patches so it will have architecture in it's name - added patches: * grub2-ppc64le-01-Add-Little-Endian-support-for-Power64-to-the-build.patch * grub2-ppc64le-02-Build-grub-as-O1-until-we-add-savegpr-and-restgpr-ro.patch * grub2-ppc64le-03-disable-creation-of-vsx-and-altivec-instructions.patch * grub2-ppc64le-04-powerpc64-LE-s-linker-knows-how-to-handle-the-undefi.patch * grub2-ppc64le-05-grub-install-can-now-recognize-and-install-a-LE-grub.patch * grub2-ppc64le-06-set-the-ABI-version-to-0x02-in-the-e_flag-of-the-PPC.patch * grub2-ppc64le-07-Add-IEEE1275_ADDR-helper.patch * grub2-ppc64le-08-Fix-some-more-warnings-when-casting.patch * grub2-ppc64le-09-Add-powerpc64-types.patch * grub2-ppc64le-10-powerpc64-is-not-necessarily-BigEndian-anymore.patch * grub2-ppc64le-11-Fix-warnings-when-building-powerpc-linux-loader-64bi.patch * grub2-ppc64le-12-GRUB_ELF_R_PPC_-processing-is-applicable-only-for-32.patch OBS-URL: https://build.opensuse.org/request/show/228323 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=81
180 lines
5.1 KiB
Diff
180 lines
5.1 KiB
Diff
Index: grub-2.02~beta2/grub-core/fs/btrfs.c
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/grub-core/fs/btrfs.c
|
|
+++ grub-2.02~beta2/grub-core/fs/btrfs.c
|
|
@@ -913,6 +913,7 @@ grub_btrfs_mount (grub_device_t dev)
|
|
{
|
|
struct grub_btrfs_data *data;
|
|
grub_err_t err;
|
|
+ const char *relpath = grub_env_get ("btrfs_relative_path");
|
|
|
|
if (!dev->disk)
|
|
{
|
|
@@ -943,11 +944,14 @@ grub_btrfs_mount (grub_device_t dev)
|
|
data->devices_attached[0].dev = dev;
|
|
data->devices_attached[0].id = data->sblock.this_device.device_id;
|
|
|
|
- err = btrfs_handle_subvol (data);
|
|
- if (err)
|
|
+ if (relpath && (relpath[0] == '1' || relpath[0] == 'y'))
|
|
{
|
|
- grub_free (data);
|
|
- return NULL;
|
|
+ err = btrfs_handle_subvol (data);
|
|
+ if (err)
|
|
+ {
|
|
+ grub_free (data);
|
|
+ return NULL;
|
|
+ }
|
|
}
|
|
|
|
return data;
|
|
@@ -1407,24 +1411,39 @@ find_path (struct grub_btrfs_data *data,
|
|
grub_size_t allocated = 0;
|
|
struct grub_btrfs_dir_item *direl = NULL;
|
|
struct grub_btrfs_key key_out;
|
|
+ int follow_default;
|
|
const char *ctoken;
|
|
grub_size_t ctokenlen;
|
|
char *path_alloc = NULL;
|
|
char *origpath = NULL;
|
|
unsigned symlinks_max = 32;
|
|
+ const char *relpath = grub_env_get ("btrfs_relative_path");
|
|
|
|
+ follow_default = 0;
|
|
origpath = grub_strdup (path);
|
|
if (!origpath)
|
|
return grub_errno;
|
|
|
|
- if (data->fs_tree)
|
|
+ if (relpath && (relpath[0] == '1' || relpath[0] == 'y'))
|
|
{
|
|
- *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
|
- *tree = data->fs_tree;
|
|
- /* This is a tree root, so everything starts at objectid 256 */
|
|
- key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
|
- key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
|
- key->offset = 0;
|
|
+ if (data->fs_tree)
|
|
+ {
|
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
|
+ *tree = data->fs_tree;
|
|
+ /* This is a tree root, so everything starts at objectid 256 */
|
|
+ key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
|
+ key->offset = 0;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
|
+ *tree = data->sblock.root_tree;
|
|
+ key->object_id = data->sblock.root_dir_objectid;
|
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
|
+ key->offset = 0;
|
|
+ follow_default = 1;
|
|
+ }
|
|
}
|
|
else
|
|
{
|
|
@@ -1435,15 +1454,23 @@ find_path (struct grub_btrfs_data *data,
|
|
|
|
while (1)
|
|
{
|
|
- while (path[0] == '/')
|
|
- path++;
|
|
- if (!path[0])
|
|
- break;
|
|
- slash = grub_strchr (path, '/');
|
|
- if (!slash)
|
|
- slash = path + grub_strlen (path);
|
|
- ctoken = path;
|
|
- ctokenlen = slash - path;
|
|
+ if (!follow_default)
|
|
+ {
|
|
+ while (path[0] == '/')
|
|
+ path++;
|
|
+ if (!path[0])
|
|
+ break;
|
|
+ slash = grub_strchr (path, '/');
|
|
+ if (!slash)
|
|
+ slash = path + grub_strlen (path);
|
|
+ ctoken = path;
|
|
+ ctokenlen = slash - path;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ ctoken = "default";
|
|
+ ctokenlen = sizeof ("default") - 1;
|
|
+ }
|
|
|
|
if (*type != GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY)
|
|
{
|
|
@@ -1454,7 +1481,9 @@ find_path (struct grub_btrfs_data *data,
|
|
|
|
if (ctokenlen == 1 && ctoken[0] == '.')
|
|
{
|
|
- path = slash;
|
|
+ if (!follow_default)
|
|
+ path = slash;
|
|
+ follow_default = 0;
|
|
continue;
|
|
}
|
|
if (ctokenlen == 2 && ctoken[0] == '.' && ctoken[1] == '.')
|
|
@@ -1485,8 +1514,9 @@ find_path (struct grub_btrfs_data *data,
|
|
*type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
|
key->object_id = key_out.offset;
|
|
|
|
- path = slash;
|
|
-
|
|
+ if (!follow_default)
|
|
+ path = slash;
|
|
+ follow_default = 0;
|
|
continue;
|
|
}
|
|
|
|
@@ -1555,7 +1585,9 @@ find_path (struct grub_btrfs_data *data,
|
|
return err;
|
|
}
|
|
|
|
- path = slash;
|
|
+ if (!follow_default)
|
|
+ path = slash;
|
|
+ follow_default = 0;
|
|
if (cdirel->type == GRUB_BTRFS_DIR_ITEM_TYPE_SYMLINK)
|
|
{
|
|
struct grub_btrfs_inode inode;
|
|
@@ -1605,14 +1637,26 @@ find_path (struct grub_btrfs_data *data,
|
|
path = path_alloc = tmp;
|
|
if (path[0] == '/')
|
|
{
|
|
- if (data->fs_tree)
|
|
+ if (relpath && (relpath[0] == '1' || relpath[0] == 'y'))
|
|
{
|
|
- *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
|
- *tree = data->fs_tree;
|
|
- /* This is a tree root, so everything starts at objectid 256 */
|
|
- key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
|
- key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
|
- key->offset = 0;
|
|
+ if (data->fs_tree)
|
|
+ {
|
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
|
+ *tree = data->fs_tree;
|
|
+ /* This is a tree root, so everything starts at objectid 256 */
|
|
+ key->object_id = grub_cpu_to_le64_compile_time (GRUB_BTRFS_OBJECT_ID_CHUNK);
|
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
|
+ key->offset = 0;
|
|
+ }
|
|
+ else
|
|
+ {
|
|
+ *type = GRUB_BTRFS_DIR_ITEM_TYPE_DIRECTORY;
|
|
+ *tree = data->sblock.root_tree;
|
|
+ key->object_id = data->sblock.root_dir_objectid;
|
|
+ key->type = GRUB_BTRFS_ITEM_TYPE_DIR_ITEM;
|
|
+ key->offset = 0;
|
|
+ follow_default = 1;
|
|
+ }
|
|
}
|
|
else
|
|
{
|