From 1b5e306f5491b1793ff0d460f304c9b6ec1b7af0 Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Mon, 9 May 2016 14:51:25 -0400 Subject: pre_install.sh: move mysql attempt counter so that all other failures are caught --- .../mythvantage/airootfs/root/linhes_install/pre_install.sh | 12 ++++++------ 1 file 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 -- cgit v0.12