From 3afa94c979c984b978142170b8dbe6533ab8536c Mon Sep 17 00:00:00 2001 From: "Ng, Wei Tee" Date: Wed, 10 May 2017 11:38:08 -0700 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (From Poky rev: 85c9b9f9c602459b32f8f301b161c9a3f6f14d4e) Ported the changes from poky meta layer into BSP layer. As the original commit was changing 2 files, this has been rework for meta-intel layer. [YOCTO #11367] Signed-off-by: Chang Rebecca Swee Fun Signed-off-by: Ng, Wei Tee Signed-off-by: Saul Wold --- .../initrdscripts/files/intel-x86-common/init-install-efi.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/recipes-core/initrdscripts/files/intel-x86-common/init-install-efi.sh b/common/recipes-core/initrdscripts/files/intel-x86-common/init-install-efi.sh index 71480055..a7a2ad4c 100644 --- a/common/recipes-core/initrdscripts/files/intel-x86-common/init-install-efi.sh +++ b/common/recipes-core/initrdscripts/files/intel-x86-common/init-install-efi.sh @@ -26,6 +26,8 @@ live_dev_name=${live_dev_name#\/dev/} case $live_dev_name in mmcblk*) ;; + nvme*) + ;; *) live_dev_name=${live_dev_name%%[0-9]*} ;; @@ -144,7 +146,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 -- cgit v1.2.3-54-g00ecf