pool/grub2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 583756 from home:michael-chang:branches:Base:System

Browse Source 
- fix wrong command output when default subvolume is toplevel tree with
  id 5 (bsc#1078775)
  * grub2-btrfs-09-get-default-subvolume.patch
- insert mdraid modules to support software RAID (bsc#1078775)
  * grub2-xen-pv-firmware.cfg

OBS-URL: https://build.opensuse.org/request/show/583756
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=292
This commit is contained in:
Michael Chang 2018-03-12 04:46:39 +00:00 committed by Git OBS Bridge
parent 5582e7fbfa
commit a651cf5fd9
3 changed files with 21 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
grub2-btrfs-09-get-default-subvolume.patch
View File

@ -1,8 +1,8 @@
Index: grub-2.02~beta2/grub-core/fs/btrfs.c Index: grub-2.02/grub-core/fs/btrfs.c
=================================================================== ===================================================================
--- grub-2.02~beta2.orig/grub-core/fs/btrfs.c --- grub-2.02.orig/grub-core/fs/btrfs.c
+++ grub-2.02~beta2/grub-core/fs/btrfs.c +++ grub-2.02/grub-core/fs/btrfs.c
@@ -2439,6 +2439,238 @@ out: @@ -2446,6 +2446,242 @@ out:
return 0; return 0;
} }
@ -198,6 +198,10 @@ Index: grub-2.02~beta2/grub-core/fs/btrfs.c
+ } + }
+ +
+ id = subvolid; + id = subvolid;
+
+ if (id == GRUB_BTRFS_ROOT_VOL_OBJECTID)
+ subvol = grub_strdup ("");
+ else
+ while (id != GRUB_BTRFS_ROOT_VOL_OBJECTID) + while (id != GRUB_BTRFS_ROOT_VOL_OBJECTID)
+ { + {
+ grub_uint64_t parent_id; + grub_uint64_t parent_id;
@ -241,7 +245,7 @@ Index: grub-2.02~beta2/grub-core/fs/btrfs.c
static struct grub_fs grub_btrfs_fs = { static struct grub_fs grub_btrfs_fs = {
.name = "btrfs", .name = "btrfs",
.dir = grub_btrfs_dir, .dir = grub_btrfs_dir,
@@ -2457,6 +2689,7 @@ static struct grub_fs grub_btrfs_fs = { @@ -2464,6 +2700,7 @@ static struct grub_fs grub_btrfs_fs = {
static grub_command_t cmd_info; static grub_command_t cmd_info;
static grub_command_t cmd_mount_subvol; static grub_command_t cmd_mount_subvol;
static grub_extcmd_t cmd_list_subvols; static grub_extcmd_t cmd_list_subvols;
@ -249,7 +253,7 @@ Index: grub-2.02~beta2/grub-core/fs/btrfs.c
static char * static char *
subvolid_set_env (struct grub_env_var *var __attribute__ ((unused)), subvolid_set_env (struct grub_env_var *var __attribute__ ((unused)),
@@ -2527,6 +2760,11 @@ GRUB_MOD_INIT (btrfs) @@ -2534,6 +2771,11 @@ GRUB_MOD_INIT (btrfs)
"[-p|-n] [-o var] DEVICE", "[-p|-n] [-o var] DEVICE",
"Print list of BtrFS subvolumes on " "Print list of BtrFS subvolumes on "
"DEVICE.", options); "DEVICE.", options);

2
grub2-xen-pv-firmware.cfg
View File

@ -4,6 +4,8 @@ insmod search
insmod configfile insmod configfile
insmod legacy_configfile insmod legacy_configfile
insmod lvm insmod lvm
insmod mdraid09
insmod mdraid1x
set debian_cddev="" set debian_cddev=""
set debian_cdarch="" set debian_cdarch=""

9
grub2.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Tue Mar 6 08:21:43 UTC 2018 - mchang@suse.com
- fix wrong command output when default subvolume is toplevel tree with
id 5 (bsc#1078775)
* grub2-btrfs-09-get-default-subvolume.patch
- insert mdraid modules to support software RAID (bsc#1078775)
* grub2-xen-pv-firmware.cfg
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 13 09:05:45 UTC 2018 - mchang@suse.com Tue Feb 13 09:05:45 UTC 2018 - mchang@suse.com