forked from pool/grub2
8ee92f5194
- Implement NV index mode for TPM 2.0 key protector
0001-protectors-Implement-NV-index.patch
- Fall back to passphrase mode when the key protector fails to
unlock the disk
0002-cryptodisk-Fallback-to-passphrase.patch
- Wipe out the cached key cleanly
0003-cryptodisk-wipe-out-the-cached-keys-from-protectors.patch
- Make diskfiler to look up cryptodisk devices first
0004-diskfilter-look-up-cryptodisk-devices-first.patch
- Version bump to 2.12~rc1
* Added:
- grub-2.12~rc1.tar.xz
* Removed:
- grub-2.06.tar.xz
* Patch dropped merged by new version:
- grub2-GRUB_CMDLINE_LINUX_RECOVERY-for-recovery-mode.patch
- grub2-s390x-02-kexec-module-added-to-emu.patch
- grub2-efi-chainloader-root.patch
- grub2-Fix-incorrect-netmask-on-ppc64.patch
- 0001-osdep-Introduce-include-grub-osdep-major.h-and-use-i.patch
- 0002-osdep-linux-hostdisk-Use-stat-instead-of-udevadm-for.patch
- 0002-net-read-bracketed-ipv6-addrs-and-port-numbers.patch
- grub2-s390x-10-keep-network-at-kexec.patch
- 0001-Fix-build-error-in-binutils-2.36.patch
- 0001-emu-fix-executable-stack-marking.patch
- 0046-squash-verifiers-Move-verifiers-API-to-kernel-image.patch
- 0001-30_uefi-firmware-fix-printf-format-with-null-byte.patch
- 0001-tpm-Pass-unknown-error-as-non-fatal-but-debug-print-.patch
- 0001-Filter-out-POSIX-locale-for-translation.patch
OBS-URL: https://build.opensuse.org/request/show/1105405
OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=458
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;
|
|
}
|