summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoe Konno <joe.konno@intel.com>2016-11-03 16:46:10 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-11-15 15:19:54 +0000
commit85c9b9f9c602459b32f8f301b161c9a3f6f14d4e (patch)
tree73fa12484fa1c5ab55f4b821666693141e45c960
parent0bb2d92e1ca0765174050a214f465d7a04f0d1f1 (diff)
downloadpoky-85c9b9f9c602459b32f8f301b161c9a3f6f14d4e.tar.gz
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>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh5
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh5
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 441e25238d..ffb709c1ce 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/}
22case $live_dev_name in 22case $live_dev_name in
23 mmcblk*) 23 mmcblk*)
24 ;; 24 ;;
25 nvme*)
26 ;;
25 *) 27 *)
26 live_dev_name=${live_dev_name%%[0-9]*} 28 live_dev_name=${live_dev_name%%[0-9]*}
27 ;; 29 ;;
@@ -146,7 +148,8 @@ swap_start=$((rootfs_end))
146# 2) they are detected asynchronously (need rootwait) 148# 2) they are detected asynchronously (need rootwait)
147rootwait="" 149rootwait=""
148part_prefix="" 150part_prefix=""
149if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then 151if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
152 [ ! "${device#/dev/nvme}" = "${device}" ]; then
150 part_prefix="p" 153 part_prefix="p"
151 rootwait="rootwait" 154 rootwait="rootwait"
152fi 155fi
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 04ce5fb4b5..572613ecd4 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/}
21case $live_dev_name in 21case $live_dev_name in
22 mmcblk*) 22 mmcblk*)
23 ;; 23 ;;
24 nvme*)
25 ;;
24 *) 26 *)
25 live_dev_name=${live_dev_name%%[0-9]*} 27 live_dev_name=${live_dev_name%%[0-9]*}
26 ;; 28 ;;
@@ -153,7 +155,8 @@ swap_start=$((rootfs_end))
153# 2) they are detected asynchronously (need rootwait) 155# 2) they are detected asynchronously (need rootwait)
154rootwait="" 156rootwait=""
155part_prefix="" 157part_prefix=""
156if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then 158if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
159 [ ! "${device#/dev/nvme}" = "${device}" ]; then
157 part_prefix="p" 160 part_prefix="p"
158 rootwait="rootwait" 161 rootwait="rootwait"
159fi 162fi