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 <[email protected]> --- meta/recipes-core/initrdscripts/files/init-install-efi.sh | 4 ++-- 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 2d20a6d..441e252 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 89d5a5d..04ce5fb 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 -- 2.6.6 -- _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
