[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1860/8267] initrdscripts/init-install*: Add rootwait when installing to USB devices

[Emmanuele Bassi <ebassi src gnome org>]

commit df6694b7c852c9ac627135d4158b306d90b7273f
Author: California Sullivan <california l sullivan intel com>
Date:   Tue Aug 9 13:35:52 2016 -0700

    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>

 .../initrdscripts/files/init-install-efi.sh        |    6 ++++++
 .../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 f564f4e..bf8a76b 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
     part_prefix="p"
     rootwait="rootwait"
 fi
+
+# USB devices also require rootwait
+if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then
+    rootwait="rootwait"
+fi
+
 bootfs=${device}${part_prefix}1
 rootfs=${device}${part_prefix}2
 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 72ce92b..5f2599e 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
     rootwait="rootwait"
 fi
 
+# USB devices also require rootwait
+if [ -n `readlink /dev/disk/by-id/usb* | grep $TARGET_DEVICE_NAME` ]; then
+    rootwait="rootwait"
+fi
+
 if [ $grub_version -eq 0 ] ; then
     bios_boot=''
     bootfs=${device}${part_prefix}1