diff options
author | Ng, Wei Tee <wei.tee.ng@intel.com> | 2017-05-10 11:38:08 -0700 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2017-05-11 10:29:32 +0800 |
commit | 3afa94c979c984b978142170b8dbe6533ab8536c (patch) | |
tree | b7b914b392c346f6fd2da597949029d2e4a08e2d /common | |
parent | 8b1bc4781ad9cda47026abc56a66810c03f61307 (diff) | |
download | meta-intel-3afa94c979c984b978142170b8dbe6533ab8536c.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>
(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 <rebecca.swee.fun.chang@intel.com>
Signed-off-by: Ng, Wei Tee <wei.tee.ng@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'common')
-rw-r--r-- | common/recipes-core/initrdscripts/files/intel-x86-common/init-install-efi.sh | 5 |
1 files changed, 4 insertions, 1 deletions
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/} | |||
26 | case $live_dev_name in | 26 | case $live_dev_name in |
27 | mmcblk*) | 27 | mmcblk*) |
28 | ;; | 28 | ;; |
29 | nvme*) | ||
30 | ;; | ||
29 | *) | 31 | *) |
30 | live_dev_name=${live_dev_name%%[0-9]*} | 32 | live_dev_name=${live_dev_name%%[0-9]*} |
31 | ;; | 33 | ;; |
@@ -144,7 +146,8 @@ swap_start=$((rootfs_end)) | |||
144 | # 2) they are detected asynchronously (need rootwait) | 146 | # 2) they are detected asynchronously (need rootwait) |
145 | rootwait="" | 147 | rootwait="" |
146 | part_prefix="" | 148 | part_prefix="" |
147 | if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then | 149 | if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \ |
150 | [ ! "${device#/dev/nvme}" = "${device}" ]; then | ||
148 | part_prefix="p" | 151 | part_prefix="p" |
149 | rootwait="rootwait" | 152 | rootwait="rootwait" |
150 | fi | 153 | fi |