summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/initrdscripts/files/init-install.sh
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/initrdscripts/files/init-install.sh')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh5
1 files changed, 4 insertions, 1 deletions
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