d108ec594a
- Introduces a new package, grub2-x86_64-efi-bls, which includes a straightforward grubbls.efi file. This file can be copied to the EFI System Partition (ESP) along with boot fragments in the Boot Loader Specification (BLS) format * 0001-Streamline-BLS-and-improve-PCR-stability.patch - Fix crash in bli module (bsc#1226497) * 0001-bli-Fix-crash-in-get_part_uuid.patch - Rework package dependencies: grub2-common now includes common userland utilities and is required by grub2 platform packages. grub2 is now a meta package that pulls in the default platform package. OBS-URL: https://build.opensuse.org/request/show/1196023 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=512
67 lines
1.5 KiB
Diff
67 lines
1.5 KiB
Diff
From: Michael Chang <mchang@suse.com>
|
|
Subject: treat mdadm ddf fakeraid as simple device
|
|
References: bnc#872360
|
|
Patch-Mainline: no
|
|
|
|
--- a/grub-core/osdep/linux/getroot.c
|
|
+++ b/grub-core/osdep/linux/getroot.c
|
|
@@ -119,7 +119,7 @@
|
|
struct btrfs_ioctl_fs_info_args)
|
|
|
|
static int
|
|
-grub_util_is_imsm (const char *os_dev);
|
|
+grub_util_is_imsm_or_ddf (const char *os_dev);
|
|
|
|
|
|
#define ESCAPED_PATH_MAX (4 * PATH_MAX)
|
|
@@ -635,10 +635,10 @@
|
|
}
|
|
|
|
static int
|
|
-grub_util_is_imsm (const char *os_dev)
|
|
+grub_util_is_imsm_or_ddf (const char *os_dev)
|
|
{
|
|
int retry;
|
|
- int is_imsm = 0;
|
|
+ int is_imsm_or_ddf = 0;
|
|
int container_seen = 0;
|
|
const char *dev = os_dev;
|
|
|
|
@@ -699,10 +699,17 @@
|
|
if (strncmp (buf, "MD_METADATA=imsm",
|
|
sizeof ("MD_METADATA=imsm") - 1) == 0)
|
|
{
|
|
- is_imsm = 1;
|
|
+ is_imsm_or_ddf = 1;
|
|
grub_util_info ("%s is imsm", dev);
|
|
break;
|
|
}
|
|
+ if (strncmp (buf, "MD_METADATA=ddf",
|
|
+ sizeof ("MD_METADATA=ddf") - 1) == 0)
|
|
+ {
|
|
+ is_imsm_or_ddf = 1;
|
|
+ grub_util_info ("%s is ddf", dev);
|
|
+ break;
|
|
+ }
|
|
}
|
|
|
|
free (buf);
|
|
@@ -713,7 +720,7 @@
|
|
|
|
if (dev != os_dev)
|
|
free ((void *) dev);
|
|
- return is_imsm;
|
|
+ return is_imsm_or_ddf;
|
|
}
|
|
|
|
char *
|
|
@@ -1078,7 +1085,7 @@
|
|
|
|
/* Check for RAID. */
|
|
if (!strncmp (os_dev, "/dev/md", 7) && ! grub_util_device_is_mapped (os_dev)
|
|
- && !grub_util_is_imsm (os_dev))
|
|
+ && !grub_util_is_imsm_or_ddf (os_dev))
|
|
return GRUB_DEV_ABSTRACTION_RAID;
|
|
return GRUB_DEV_ABSTRACTION_NONE;
|
|
}
|