summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2015-08-01 16:49:32 +0200
committerMax Krummenacher <max.oss.09@gmail.com>2015-10-12 15:15:41 +0200
commitac0600f7926904c69c7f57f04030f37db0337c85 (patch)
tree10e54baf7a90bc64933a352b4fb7845bfa05c6eb
parente9ad3d9002273b141953ad7bfa402f13d79042fa (diff)
update.sh: fix test for parted
Now that we exit on failure the test for a user accessible parted must not return an error code.
-rwxr-xr-xrecipes/images/files/library/imx6/update.sh2
-rwxr-xr-xrecipes/images/files/library/tegra/update.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/recipes/images/files/library/imx6/update.sh b/recipes/images/files/library/imx6/update.sh
index 4dd7592..1932804 100755
--- a/recipes/images/files/library/imx6/update.sh
+++ b/recipes/images/files/library/imx6/update.sh
@@ -9,7 +9,7 @@ set -e
# sometimes we need the binary echo, not the shell builtin
ECHO=`which echo`
#some distros have fs tools only in root's path
-PARTED=`which parted` 2> /dev/null
+PARTED=`which parted` 2> /dev/null || true
if [ -e "$PARTED" ] ; then
MKFSVFAT=`which mkfs.vfat`
else
diff --git a/recipes/images/files/library/tegra/update.sh b/recipes/images/files/library/tegra/update.sh
index 862ceb5..e765990 100755
--- a/recipes/images/files/library/tegra/update.sh
+++ b/recipes/images/files/library/tegra/update.sh
@@ -8,7 +8,7 @@ set -e
# sometimes we need the binary echo, not the shell builtin
ECHO=`which echo`
#some distros have fs tools only in root's path
-PARTED=`which parted` 2> /dev/null
+PARTED=`which parted` 2> /dev/null || true
if [ -e "$PARTED" ] ; then
MKFSVFAT=`which mkfs.vfat`
else