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>
This commit is contained in:
parent
2fedd226c3
commit
087c580b28
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue