[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3322/8267] initrdscripts: add support for NVME target install

[Emmanuele Bassi <ebassi src gnome org>]

commit 85c9b9f9c602459b32f8f301b161c9a3f6f14d4e
Author: Joe Konno <joe konno intel com>
Date:   Thu Nov 3 16:46:10 2016 -0700

    initrdscripts: add support for NVME target install
    
    Add awareness of /dev/nvme* block devices to install scripts. As presently
    written, installer knows only of /dev/sd* and /dev/mmcblk* block devices.
    Building upon scaffolding put in place by Awais in...
    
        80ec9f627915 ("initrdscripts: handle mmc device as installer medium")
    
    (From OE-Core rev: b5a036ce958e3fe24690531712071abc14b48033)
    
    Signed-off-by: Joe Konno <joe konno intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 .../initrdscripts/files/init-install-efi.sh        |    5 ++++-
 .../initrdscripts/files/init-install.sh            |    5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)
---
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh 
b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 441e252..ffb709c 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -22,6 +22,8 @@ live_dev_name=${live_dev_name#\/dev/}
 case $live_dev_name in
     mmcblk*)
     ;;
+    nvme*)
+    ;;
     *)
         live_dev_name=${live_dev_name%%[0-9]*}
     ;;
@@ -146,7 +148,8 @@ swap_start=$((rootfs_end))
 # 2) they are detected asynchronously (need rootwait)
 rootwait=""
 part_prefix=""
-if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then
+if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
+   [ ! "${device#/dev/nvme}" = "${device}" ]; then
     part_prefix="p"
     rootwait="rootwait"
 fi
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh 
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 04ce5fb..572613e 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -21,6 +21,8 @@ live_dev_name=${live_dev_name#\/dev/}
 case $live_dev_name in
     mmcblk*)
     ;;
+    nvme*)
+    ;;
     *)
         live_dev_name=${live_dev_name%%[0-9]*}
     ;;
@@ -153,7 +155,8 @@ swap_start=$((rootfs_end))
 # 2) they are detected asynchronously (need rootwait)
 rootwait=""
 part_prefix=""
-if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then
+if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
+   [ ! "${device#/dev/nvme}" = "${device}" ]; then
     part_prefix="p"
     rootwait="rootwait"
 fi