summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAwais Belal <awais_belal@mentor.com>2016-08-10 13:14:16 +0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-17 10:35:40 +0100
commit993bfb55c7ce01ac3f3e4d1720474ae0c7aeee18 (patch)
tree33ea85b677a8916a6ab2a67e2ecc80d46893a828
parent4b9c75a953120b7c4a370aac8e8d14111e86b36b (diff)
downloadpoky-993bfb55c7ce01ac3f3e4d1720474ae0c7aeee18.tar.gz
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>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh8
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh8
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 bf8a76b96b..3134486aae 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
29 29
30echo "Searching for hard drives ..." 30echo "Searching for hard drives ..."
31 31
32for device in `ls /sys/block/`; do 32# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
33# we're currently only interested in the root device so pick them wisely
34devices=`ls /sys/block/ | grep -v mmcblk`
35mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"`
36devices="$devices $mmc_devices"
37
38for device in $devices; do
33 case $device in 39 case $device in
34 loop*) 40 loop*)
35 # skip loop device 41 # skip loop device
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 5f2599e724..0542e26fd2 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -28,7 +28,13 @@ esac
28 28
29echo "Searching for hard drives ..." 29echo "Searching for hard drives ..."
30 30
31for device in `ls /sys/block/`; do 31# Some eMMC devices have special sub devices such as mmcblk0boot0 etc
32# we're currently only interested in the root device so pick them wisely
33devices=`ls /sys/block/ | grep -v mmcblk`
34mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"`
35devices="$devices $mmc_devices"
36
37for device in $devices; do
32 case $device in 38 case $device in
33 loop*) 39 loop*)
34 # skip loop device 40 # skip loop device