diff options
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 5 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 5 |
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/} | |||
22 | case $live_dev_name in | 22 | case $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) |
147 | rootwait="" | 149 | rootwait="" |
148 | part_prefix="" | 150 | part_prefix="" |
149 | if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then | 151 | if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \ |
152 | [ ! "${device#/dev/nvme}" = "${device}" ]; then | ||
150 | part_prefix="p" | 153 | part_prefix="p" |
151 | rootwait="rootwait" | 154 | rootwait="rootwait" |
152 | fi | 155 | fi |
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/} | |||
21 | case $live_dev_name in | 21 | case $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) |
154 | rootwait="" | 156 | rootwait="" |
155 | part_prefix="" | 157 | part_prefix="" |
156 | if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then | 158 | if [ ! "${device#/dev/mmcblk}" = "${device}" ] || \ |
159 | [ ! "${device#/dev/nvme}" = "${device}" ]; then | ||
157 | part_prefix="p" | 160 | part_prefix="p" |
158 | rootwait="rootwait" | 161 | rootwait="rootwait" |
159 | fi | 162 | fi |