summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlejandro Hernandez <alejandro.hernandez@linux.intel.com>2016-08-30 05:08:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-08-30 07:57:50 +0100
commit087c580b286816265f487e02746bfa6e26081554 (patch)
tree58c1d7abd6424f5de0982949c9f5d4c30fcfd4c3
parent2fedd226c3385f1ac160b3aa0bfadbded85e288c (diff)
downloadpoky-087c580b286816265f487e02746bfa6e26081554.tar.gz
init-install: Fixes the install script failing when not finding any mmcblk devices
The init-install.sh and init-install-efi.sh scripts perform a check to see which devices are available on a booted system for installation. Recently, the way we check for these devices changed on 993bfb, greping for devices found on /sys/block/, this change caused the installer to fail (at least) when not finding any mmcblk devices, due to the fact that we call sh -e to execute this script, so any command (grep) or pipeline exiting with a non-zero status causes the whole script to exit This patch throws in a harmless true exit status at the end of the pipeline(s) of the grep commands to avoid the installer script from exiting, fixing the issue. [YOCTO #10189] (From OE-Core rev: 384cf92ca9c3e66763c2c1ff2776c53d47ae25d6) Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install-efi.sh4
-rw-r--r--meta/recipes-core/initrdscripts/files/init-install.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
index 2d20a6dad7..441e25238d 100644
--- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh
@@ -31,8 +31,8 @@ echo "Searching for hard drives ..."
31 31
32# Some eMMC devices have special sub devices such as mmcblk0boot0 etc 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 33# we're currently only interested in the root device so pick them wisely
34devices=`ls /sys/block/ | grep -v mmcblk` 34devices=`ls /sys/block/ | grep -v mmcblk` || true
35mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` 35mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true
36devices="$devices $mmc_devices" 36devices="$devices $mmc_devices"
37 37
38for device in $devices; do 38for device in $devices; do
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh
index 89d5a5d9a4..04ce5fb4b5 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -30,8 +30,8 @@ echo "Searching for hard drives ..."
30 30
31# Some eMMC devices have special sub devices such as mmcblk0boot0 etc 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 32# we're currently only interested in the root device so pick them wisely
33devices=`ls /sys/block/ | grep -v mmcblk` 33devices=`ls /sys/block/ | grep -v mmcblk` || true
34mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` 34mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true
35devices="$devices $mmc_devices" 35devices="$devices $mmc_devices"
36 36
37for device in $devices; do 37for device in $devices; do