diff options
| author | Alejandro Hernandez <alejandro.hernandez@linux.intel.com> | 2016-08-30 05:08:37 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-08-30 07:57:46 +0100 |
| commit | 384cf92ca9c3e66763c2c1ff2776c53d47ae25d6 (patch) | |
| tree | bf05342365c6fe84763f767a4ffec910cef22385 | |
| parent | 00027aee12f4bbc9a4ba607c91fcc1e0e8257fa2 (diff) | |
| download | openembedded-core-384cf92ca9c3e66763c2c1ff2776c53d47ae25d6.tar.gz openembedded-core-384cf92ca9c3e66763c2c1ff2776c53d47ae25d6.tar.bz2 openembedded-core-384cf92ca9c3e66763c2c1ff2776c53d47ae25d6.zip | |
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]
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.sh | 4 | ||||
| -rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 4 |
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 ..." # 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=`ls /sys/block/ | grep -v mmcblk` || true +mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true devices="$devices $mmc_devices" for 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 ..." # 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=`ls /sys/block/ | grep -v mmcblk` || true +mmc_devices=`ls /sys/block/ | grep "mmcblk[0-9]\{1,\}$"` || true devices="$devices $mmc_devices" for device in $devices; do |