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

Accepting request 639871 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/639871
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/grub2?expand=0&rev=195
This commit is contained in:
Dominique Leuenberger
2018-10-09 13:52:40 +00:00
committed by Git OBS Bridge
parent dbc88650a2 209e8b508d
commit 34fa74c715
4 changed files with 110 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
grub2-getroot-support-nvdimm.patch Normal file
View File

@@ -0,0 +1,71 @@
From 889c0894d358e48c02f8225426893094f20004e5 Mon Sep 17 00:00:00 2001
From: Gary Lin <glin@suse.com>
Date: Thu, 4 Oct 2018 10:32:07 +0800
Subject: [PATCH] linux/getroot: Support NVDIMM device names
There are two types of NVDIMM block devices in linux: fsdax and blk.
For fsdax, the device name would be /dev/pmemXpY, /dev/pmemXsY,
/dev/pmemX.YpZ, or /dev/pmemX.YsZ.
For blk, the name would be /dev/ndblkX.YpZ or /dev/ndblkX.YsZ
---
grub-core/osdep/linux/getroot.c | 44 +++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/grub-core/osdep/linux/getroot.c b/grub-core/osdep/linux/getroot.c
index 8776009..d2ab60f 100644
--- a/grub-core/osdep/linux/getroot.c
+++ b/grub-core/osdep/linux/getroot.c
@@ -1082,6 +1082,50 @@ grub_util_part_to_disk (const char *os_dev, struct stat *st,
*pp = '\0';
return path;
}
+
+ /* If this is a NVDIMM device in fsdax mode */
+ if (strncmp ("pmem", p, 4) == 0 && p[4] >= '0' && p[4] <= '9')
+ {
+ /* /dev/pmem[0-9]+(\.[0-9]+)?((p[0-9]+)?|s[0-9]*) */
+ char *pp = strchr (p + 4, 'p');
+ if (pp)
+ {
+ *is_part = 1;
+ *pp = '\0';
+ }
+ else
+ {
+ pp = strchr (p + 4, 's');
+ if (pp && pp[1] >= '0' && pp[1] <= '9')
+ {
+ *is_part = 1;
+ pp[1] = '\0';
+ }
+ }
+ return path;
+ }
+
+ /* If this is a NVDIMM device in block mode */
+ if (strncmp ("ndblk", p, 5) == 0 && p[5] >= '0' && p[5] <= '9')
+ {
+ /* /dev/ndblk[0-9]+\.[0-9]+((p[0-9]+)?|s[0-9]*) */
+ char *pp = strchr (p + 5, 'p');
+ if (pp)
+ {
+ *is_part = 1;
+ *pp = '\0';
+ }
+ else
+ {
+ pp = strchr (p + 5, 's');
+ if (pp && pp[1] >= '0' && pp[1] <= '9')
+ {
+ *is_part = 1;
+ pp[1] = '\0';
+ }
+ }
+ return path;
+ }
}
return path;
--
2.19.0

22
grub2-util-30_os-prober-multiple-initrd.patch Normal file
View File

@@ -0,0 +1,22 @@
Index: grub-2.02/util/grub.d/30_os-prober.in
===================================================================
--- grub-2.02.orig/util/grub.d/30_os-prober.in
+++ grub-2.02/util/grub.d/30_os-prober.in
@@ -216,7 +216,7 @@ EOF
LBOOT="`echo ${LINUX} | cut -d ':' -f 2`"
LLABEL="`echo ${LINUX} | cut -d ':' -f 3 | tr '^' ' '`"
LKERNEL="`echo ${LINUX} | cut -d ':' -f 4`"
- LINITRD="`echo ${LINUX} | cut -d ':' -f 5`"
+ LINITRD="`echo ${LINUX} | cut -d ':' -f 5 | tr '^' ' '`"
LPARAMS="`echo ${LINUX} | cut -d ':' -f 6- | tr '^' ' '`"
if [ -z "${LLABEL}" ] ; then
@@ -225,7 +225,7 @@ EOF
if [ "${LROOT}" != "${LBOOT}" ]; then
LKERNEL="${LKERNEL#/boot}"
- LINITRD="${LINITRD#/boot}"
+ LINITRD="$(echo $LINITRD | sed -e 's!^/boot!!' -e 's!\(\s\)/boot!\1!g')"
fi
onstr="$(gettext_printf "(on %s)" "${DEVICE}")"

13
grub2.changes
View File

@@ -1,3 +1,16 @@
-------------------------------------------------------------------
Thu Oct 4 06:52:58 UTC 2018 - glin@suse.com
- Support NVDIMM device names (bsc#1110073)
* grub2-getroot-support-nvdimm.patch
-------------------------------------------------------------------
Wed Oct 3 07:08:14 UTC 2018 - mchang@suse.com
- Translate caret back to space as the initrd stanza could use space to
delimit multiple files loaded (bsc#1101942)
* grub2-util-30_os-prober-multiple-initrd.patch
-------------------------------------------------------------------
Wed Sep 26 08:01:05 UTC 2018 - mchang@suse.com

4
grub2.spec
View File

@@ -221,6 +221,8 @@ Patch88: unix-exec-avoid-atexit-handlers-when-child-exits.patch
Patch89: 0001-xfs-Accept-filesystem-with-sparse-inodes.patch
Patch90: grub2-binutils2.31.patch
Patch91: grub2-msdos-fix-overflow.patch
Patch92: grub2-util-30_os-prober-multiple-initrd.patch
Patch93: grub2-getroot-support-nvdimm.patch
# Btrfs snapshot booting related patches
Patch101: grub2-btrfs-01-add-ability-to-boot-from-subvolumes.patch
Patch102: grub2-btrfs-02-export-subvolume-envvars.patch
@@ -519,6 +521,8 @@ swap partition while in resuming
%patch89 -p1
%patch90 -p1
%patch91 -p1
%patch92 -p1
%patch93 -p1
%patch101 -p1
%patch102 -p1
%patch103 -p1