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 f564f4e2d6..bf8a76b96b 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh | |||
@@ -144,6 +144,12 @@ if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then | |||
144 | part_prefix="p" | 144 | part_prefix="p" |
145 | rootwait="rootwait" | 145 | rootwait="rootwait" |
146 | fi | 146 | fi |
147 | |||
148 | # USB devices also require rootwait | ||
149 | if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then | ||
150 | rootwait="rootwait" | ||
151 | fi | ||
152 | |||
147 | bootfs=${device}${part_prefix}1 | 153 | bootfs=${device}${part_prefix}1 |
148 | rootfs=${device}${part_prefix}2 | 154 | rootfs=${device}${part_prefix}2 |
149 | swap=${device}${part_prefix}3 | 155 | 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 72ce92b964..5f2599e724 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh | |||
@@ -152,6 +152,11 @@ if [ ! "${device#/dev/mmcblk}" = "${device}" ]; then | |||
152 | rootwait="rootwait" | 152 | rootwait="rootwait" |
153 | fi | 153 | fi |
154 | 154 | ||
155 | # USB devices also require rootwait | ||
156 | if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then | ||
157 | rootwait="rootwait" | ||
158 | fi | ||
159 | |||
155 | if [ $grub_version -eq 0 ] ; then | 160 | if [ $grub_version -eq 0 ] ; then |
156 | bios_boot='' | 161 | bios_boot='' |
157 | bootfs=${device}${part_prefix}1 | 162 | bootfs=${device}${part_prefix}1 |