mirror of
https://src.fedoraproject.org/rpms/grub2.git
synced 2024-12-01 08:49:52 +00:00
db7cf3a089
Add some fixes for BLS parsing logic and also make 20-grub.install script to query the relative path of the kernel and initramfs images, so BLS can also work when /boot is not a mount point or is a btrfs subvolume. Also pull some build fixes. Resolves: rhbz#1588184 Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
29 lines
933 B
Diff
29 lines
933 B
Diff
From 35c1015fc1a4313be34757eebb195547336e0edf Mon Sep 17 00:00:00 2001
|
|
From: Michael Chang <mchang@suse.com>
|
|
Date: Wed, 18 Dec 2013 09:57:04 +0000
|
|
Subject: [PATCH 174/243] export btrfs_subvol and btrfs_subvolid
|
|
|
|
We should export btrfs_subvol and btrfs_subvolid to have both visible
|
|
to subsidiary configuration files loaded using configfile.
|
|
|
|
Signed-off-by: Michael Chang <mchang@suse.com>
|
|
---
|
|
grub-core/fs/btrfs.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/grub-core/fs/btrfs.c b/grub-core/fs/btrfs.c
|
|
index 38facf3cb8b..3962961666e 100644
|
|
--- a/grub-core/fs/btrfs.c
|
|
+++ b/grub-core/fs/btrfs.c
|
|
@@ -2273,6 +2273,8 @@ GRUB_MOD_INIT (btrfs)
|
|
subvol_set_env);
|
|
grub_register_variable_hook ("btrfs_subvolid", subvolid_get_env,
|
|
subvolid_set_env);
|
|
+ grub_env_export ("btrfs_subvol");
|
|
+ grub_env_export ("btrfs_subvolid");
|
|
}
|
|
|
|
GRUB_MOD_FINI (btrfs)
|
|
--
|
|
2.17.1
|
|
|