summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Thompson <daniel.thompson@linaro.org>2014-12-15 14:49:16 +0000
committerDaniel Thompson <daniel.thompson@linaro.org>2014-12-15 14:54:07 +0000
commitffdd95c9a889cc5df47d8f8aa841e067549d35ab (patch)
tree5270180cf39f38f07f7176e3ff0be5f58bafa342
parent415c7f8374ecfacbc617753c2574c10692a3f1af (diff)
downloadlinaro-android-tools-linaro_android_4.4.tar.gz
linaro-android-nfs-tool.sh: support multi fstab fileslinaro_android_4.4
vexpress builds contains multiple fstab files for the various vexpress kernels. Although the main logic of the tool copes with multiple files perfectly well there is an over zealous check that causes the tool to bomb out. Improve this check. Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org> Change-Id: I392e8e268a17b762f1478d9abaa18a38d8b487ca
-rwxr-xr-xlinaro-android-nfs-tool.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/linaro-android-nfs-tool.sh b/linaro-android-nfs-tool.sh
index 2195903..f91fb3d 100755
--- a/linaro-android-nfs-tool.sh
+++ b/linaro-android-nfs-tool.sh
@@ -263,7 +263,7 @@ function uncompress_tarball(){
function update_init_files(){
count=$(ls -l ${nfs_entry_path}/fstab.* 2>/dev/null|wc -l)
- if [ "X${count}" != "X1" ];then
+ if [ "${count}" -lt 1 ];then
echo "Failed to find the fstab file in root directory"
exit 1
fi
@@ -272,8 +272,6 @@ function update_init_files(){
sed -i "\%\s\+/system\s\+%d" ${file_fstab}
sed -i "\%\s\+/cache\s\+%d" ${file_fstab}
- file_fstab_basename=$(basename "${file_fstab}")
- hardware=${file_fstab_basename#fstab.}
#hack on installd command to support boot via nfs
echo "hack.installd.for.nfs=1" >> ${nfs_entry_path}/system/build.prop
}