165a6b361f
- snapper rollback support patches. - rename patch * 0002-btrfs-add-ability-to-boot-from-subvolumes.patch to grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch * 0004-btrfs-export-subvolume-envvars.patch to grub2-btrfs-02-export-subvolume-envvars.patch - added patches * grub2-btrfs-03-follow_default.patch * grub2-btrfs-04-grub2-install.patch * grub2-btrfs-05-grub2-mkconfig.patch - remove patch * 0003-cmdline-add-envvar-loader_cmdline_append.patch OBS-URL: https://build.opensuse.org/request/show/245527 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=106
22 lines
764 B
Diff
22 lines
764 B
Diff
From: Michael Chang <mchang@suse.com>
|
|
Subject: 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>
|
|
|
|
Index: grub-2.00/grub-core/fs/btrfs.c
|
|
===================================================================
|
|
--- grub-2.00.orig/grub-core/fs/btrfs.c
|
|
+++ grub-2.00/grub-core/fs/btrfs.c
|
|
@@ -2252,6 +2252,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)
|