summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBritney Fransen <brfransen@gmail.com>2016-05-09 18:51:25 (GMT)
committerBritney Fransen <brfransen@gmail.com>2016-05-09 18:51:25 (GMT)
commit1b5e306f5491b1793ff0d460f304c9b6ec1b7af0 (patch)
treeab50503f3e9bac8c01f06c5e6695b967bc6dc6f8
parentb9ce3c1484566e8911e03dca87a6e8d07b970066 (diff)
downloadlinhes_dev-1b5e306f5491b1793ff0d460f304c9b6ec1b7af0.zip
pre_install.sh: move mysql attempt counter so that all other failures are caught
-rwxr-xr-xbuild_tools/archiso-19/mythvantage/airootfs/root/linhes_install/pre_install.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/build_tools/archiso-19/mythvantage/airootfs/root/linhes_install/pre_install.sh b/build_tools/archiso-19/mythvantage/airootfs/root/linhes_install/pre_install.sh
index 83224b7..f9e9c5a 100755
--- a/build_tools/archiso-19/mythvantage/airootfs/root/linhes_install/pre_install.sh
+++ b/build_tools/archiso-19/mythvantage/airootfs/root/linhes_install/pre_install.sh
@@ -45,19 +45,19 @@ do
mysqlstatus=$?
if [ $mysqlstatus = 0 ]
then
- mysql_check && install_db
- mythconverg_check
+ mysql_check && install_db
+ mythconverg_check
status=$?
else
- ((ATTEMPT=ATTEMPT+1))
- systemctl stop mysqld.service
+ systemctl stop mysqld.service
#/etc/rc.d/mysqld stop
sleep 2
fi
+ ((ATTEMPT=ATTEMPT+1))
if [ $ATTEMPT = 20 ]
then
- printhl " Could not start mysql or install mythconverg within 20 attempts"
- printhl " Aborting install"
+ printhl " Could not start mysql or install mythconverg in 20 attempts"
+ printhl " Aborting install"
exit 20
fi
done