summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--common/recipes-core/initrdscripts/files/intel-x86-common/init-install-efi.sh5
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/}
26case $live_dev_name in 26case $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)
145rootwait="" 147rootwait=""
146part_prefix="" 148part_prefix=""
147if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then 149if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \
150[ ! "${device#/dev/nvme}" = "${device}" ]; then
148 part_prefix="p" 151 part_prefix="p"
149 rootwait="rootwait" 152 rootwait="rootwait"
150fi 153fi