[gnome-continuous-yocto/gnomeostree-3.28-rocko: 1868/8267] init-install*: only pick root mmc devices

[Emmanuele Bassi <ebassi src gnome org>]

commit 993bfb55c7ce01ac3f3e4d1720474ae0c7aeee18
Author: Awais Belal <awais_belal mentor com>
Date:   Wed Aug 10 13:14:16 2016 +0500

    init-install*: only pick root mmc devices
    
    Some eMMC devices show special sub-devices such as mmcblk0boot0
    etc. The installation script currently pick all of them up and
    displays it to the user which makes some confusions because these
    sub-devices are pretty small and complete installation including
    rootfs won't be possible in most cases.
    We simply now drop these sub-devices and only present the user
    with the root of such mmc devices.
    
    (From OE-Core rev: 4b4d80306de8d8a2e3a2d784890f34e4a0ecfcf0)
    
    Signed-off-by: Awais Belal <awais_belal mentor 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        |    8 +++++++-
 .../initrdscripts/files/init-install.sh            |    8 +++++++-
 2 files changed, 14 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 bf8a76b..3134486 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -29,7 +29,13 @@ esac
 
 echo "Searching for hard drives ..."
 
-for device in `ls /sys/block/`; do
+# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
+# we're currently only interested in the root device so pick them wisely
+devices=`ls /sys/block/ | grep -v mmcblk`
+mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"`
+devices="$devices $mmc_devices"
+
+for device in $devices; do
     case $device in
         loop*)
             # skip loop device
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh 
b/meta/recipes-core/initrdscripts/files/init-install.sh
index 5f2599e..0542e26 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -28,7 +28,13 @@ esac
 
 echo "Searching for hard drives ..."
 
-for device in `ls /sys/block/`; do
+# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
+# we're currently only interested in the root device so pick them wisely
+devices=`ls /sys/block/ | grep -v mmcblk`
+mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"`
+devices="$devices $mmc_devices"
+
+for device in $devices; do
     case $device in
         loop*)
             # skip loop device