9bc71d03db
- Merge changes from SLE12 - Do not pass root= when root is on nfs (bnc#894374) * modified grub2-pass-corret-root-for-nfsroot.patch * modified grub2-secureboot-provide-linuxefi-config.patch * modified grub2-secureboot-use-linuxefi-on-uefi.patch - Fix xen pvops kernel not appear on menu (bnc#895286) * modified grub2-fix-menu-in-xen-host-server.patch - Workaround grub2-once (bnc#892358) * added grub2-btrfs-workaround-grub2-once.patch * added grub2-once.service * modified grub2-once - Fix busy-loop and hang while network booting (bnc#870613) * added grub2-netboot-hang.patch - Add warning in grubenv file about editing it directly (bnc#887008) * added grub2-editenv-add-warning-message.patch - Fix broken graphics with efifb on QEMU/KVM and nomodeset (bnc#884558) * added grub2-efi-disable-video-cirrus-and-bochus.patch - Disable video support on Power (bnc#877142) * added grub2-ppc64le-disable-video.patch - Track occupied memory so it can be released on exit (bnc#885026) * added grub2-ppc64le-memory-map.patch - Fix grub.xen config searching path on boot partition (bnc#884828) - Add linux16 and initrd16 to grub.xen (bnc#884830) * added grub2-xen-linux16.patch - VLAN tag support (fate#315753) * added 0001-Add-bootargs-parser-for-open-firmware.patch * added 0002-Add-Virtual-LAN-support.patch - Use chainloader to boot xen.efi under UEFI (bnc#871857) * added grub2-efi-xen-chainload.patch - Use device part of chainloader target, if present (bnc#871857) OBS-URL: https://build.opensuse.org/request/show/295632 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=148
37 lines
1.0 KiB
Diff
37 lines
1.0 KiB
Diff
From 9706066791b994a55fb2d3d532a86aa1fde2a457 Mon Sep 17 00:00:00 2001
|
|
From: Vladimir Serbinenko <phcoder@gmail.com>
|
|
Date: Thu, 3 Apr 2014 21:31:12 +0200
|
|
Subject: [PATCH] * grub-core/osdep/linux/getroot.c (grub_util_part_to_disk): Support NVMe device names.
|
|
References: bnc#873132
|
|
|
|
---
|
|
|
|
Index: grub-2.02~beta2/grub-core/osdep/linux/getroot.c
|
|
===================================================================
|
|
--- grub-2.02~beta2.orig/grub-core/osdep/linux/getroot.c
|
|
+++ grub-2.02~beta2/grub-core/osdep/linux/getroot.c
|
|
@@ -883,6 +883,23 @@ grub_util_part_to_disk (const char *os_d
|
|
*pp = '\0';
|
|
return path;
|
|
}
|
|
+
|
|
+ /* If this is a NVMe device */
|
|
+ if ((strncmp ("nvme", p, 4) == 0) && p[4] >= '0' && p[4] <= '9')
|
|
+ {
|
|
+ char *pp = p + 4;
|
|
+ while (*pp >= '0' && *pp <= '9')
|
|
+ pp++;
|
|
+ if (*pp == 'n')
|
|
+ pp++;
|
|
+ while (*pp >= '0' && *pp <= '9')
|
|
+ pp++;
|
|
+ if (*pp == 'p')
|
|
+ *is_part = 1;
|
|
+ /* /dev/nvme[0-9]+n[0-9]+p[0-9]* */
|
|
+ *pp = '\0';
|
|
+ return path;
|
|
+ }
|
|
}
|
|
|
|
return path;
|