Thread (3 messages) 3 messages, 2 authors, 2016-08-30

Re: [PATCH] init-install*: only pick root mmc devices

From: Saul Wold <hidden>
Date: 2016-08-30 05:34:43

On Wed, 2016-08-10 at 13:14 +0500, Awais Belal wrote:
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.
Hi Awais:

We recently ran a full QA pass and found a problem with installing
genericx86* machines files as Bug #10189 [1].  It appears it might be
related to this or another of your init-install patches.

Since we are approaching M3 closure today this would be a bad issue to
have following us into M3.  

Please review the bug and try to test with genericx86 likely without an
MMC device.

Thanks
  Sau!

[1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=10189
quoted hunk ↗ jump to hunk
Signed-off-by: Awais Belal <redacted>
---
 meta/recipes-core/initrdscripts/files/init-install-efi.sh | 8
+++++++-
 meta/recipes-core/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 f564f4e..776dcbb 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 72ce92b..9c4189b 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
-- 
1.9.1
  
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help