summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorCalifornia Sullivan <california.l.sullivan@intel.com>2016-08-09 13:35:52 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-17 10:35:39 +0100
commitdf6694b7c852c9ac627135d4158b306d90b7273f (patch)
tree43eff388f3f935a41026ed96ec621f4e49a636e2 /meta/recipes-core
parent08a54713acf424f45d8588c5c149a6053c9ac9c5 (diff)
downloadpoky-df6694b7c852c9ac627135d4158b306d90b7273f.tar.gz
initrdscripts/init-install*: Add rootwait when installing to USB devices
It can take a bit for USB devices to be detected, so if a USB device is your rootfs and you don't set rootwait you will most likely get a kernel panic. Fix this by adding rootwait to the kernel command line on installation. Fixes [YOCTO #9462]. (From OE-Core rev: 40e2d36573a7a6bce377b1f9653607065ba5ffb6) Signed-off-by: California Sullivan <california.l.sullivan@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh6
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh5
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"
146fi 146fi
147
148# USB devices also require rootwait
149if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then
150 rootwait="rootwait"
151fi
152
147bootfs=${device}${part_prefix}1 153bootfs=${device}${part_prefix}1
148rootfs=${device}${part_prefix}2 154rootfs=${device}${part_prefix}2
149swap=${device}${part_prefix}3 155swap=${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"
153fi 153fi
154 154
155# USB devices also require rootwait
156if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then
157 rootwait="rootwait"
158fi
159
155if [ $grub_version -eq 0 ] ; then 160if [ $grub_version -eq 0 ] ; then
156 bios_boot='' 161 bios_boot=''
157 bootfs=${device}${part_prefix}1 162 bootfs=${device}${part_prefix}1