diff options
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install-efi.sh | 6 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index d58826a240..d4c5fb3297 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh | |||
@@ -138,6 +138,12 @@ if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then | |||
138 | part_prefix="p" | 138 | part_prefix="p" |
139 | rootwait="rootwait" | 139 | rootwait="rootwait" |
140 | fi | 140 | fi |
141 | |||
142 | # USB devices also require rootwait | ||
143 | if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then | ||
144 | rootwait="rootwait" | ||
145 | fi | ||
146 | |||
141 | bootfs=${device}${part_prefix}1 | 147 | bootfs=${device}${part_prefix}1 |
142 | rootfs=${device}${part_prefix}2 | 148 | rootfs=${device}${part_prefix}2 |
143 | swap=${device}${part_prefix}3 | 149 | swap=${device}${part_prefix}3 |
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index c5623eeb26..fddaf6aa82 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh | |||
@@ -146,6 +146,11 @@ if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then | |||
146 | rootwait="rootwait" | 146 | rootwait="rootwait" |
147 | fi | 147 | fi |
148 | 148 | ||
149 | # USB devices also require rootwait | ||
150 | if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then | ||
151 | rootwait="rootwait" | ||
152 | fi | ||
153 | |||
149 | if [ $grub_version -eq 0 ] ; then | 154 | if [ $grub_version -eq 0 ] ; then |
150 | bios_boot='' | 155 | bios_boot='' |
151 | bootfs=${device}${part_prefix}1 | 156 | bootfs=${device}${part_prefix}1 |