summaryrefslogtreecommitdiffstats
path: root/abs/core-testing/LinHES-config-svn
diff options
context:
space:
mode:
authorBob Igo <bob@stormlogic.com>2009-06-06 20:51:42 (GMT)
committerBob Igo <bob@stormlogic.com>2009-06-06 20:51:42 (GMT)
commit9c88cd43e4ac8a83bd5eb77616ba0d13f08a891a (patch)
tree8d92e12969a08ece07657486b877ad841fd31dcc /abs/core-testing/LinHES-config-svn
parent8dd571de2d83b945fef01103fbe8c241e774f0e3 (diff)
parentc13eeafc9aa43d7b2c4a457987409e9da03af481 (diff)
downloadlinhes_pkgbuild-9c88cd43e4ac8a83bd5eb77616ba0d13f08a891a.zip
linhes_pkgbuild-9c88cd43e4ac8a83bd5eb77616ba0d13f08a891a.tar.gz
linhes_pkgbuild-9c88cd43e4ac8a83bd5eb77616ba0d13f08a891a.tar.bz2
merge, plus some robustness options for install_db_chroot.sh
Diffstat (limited to 'abs/core-testing/LinHES-config-svn')
-rwxr-xr-xabs/core-testing/LinHES-config-svn/install_db_chroot.sh8
1 files changed, 6 insertions, 2 deletions
diff --git a/abs/core-testing/LinHES-config-svn/install_db_chroot.sh b/abs/core-testing/LinHES-config-svn/install_db_chroot.sh
index 6dcbfd5..808dbb9 100755
--- a/abs/core-testing/LinHES-config-svn/install_db_chroot.sh
+++ b/abs/core-testing/LinHES-config-svn/install_db_chroot.sh
@@ -6,7 +6,7 @@
myhost=$hostname
hostname $myhost
echo $myhost > /etc/hostname
-echo "install_db_chroot hostname is $hostname"
+echo "$0 hostname is $hostname"
. $MV_ROOT/bin/install_functions.sh
#myhost=`cat /etc/hostname`
@@ -16,8 +16,9 @@ echo "install_db_chroot hostname is $hostname"
# that the database can be initialized.
/etc/rc.d/mysqld stop
-/etc/rc.d/mysqld stop
+killall -9 mysqld
/etc/rc.d/mysqld start
+sleep 1
# Put a limit on how many times we try to (re-)start MySQL
success_test() {
@@ -49,6 +50,7 @@ while true; do
else
echo "MySQL server is not running. Trying to start it."
# Maybe it just needs to be started
+ sleep 1
/etc/rc.d/mysqld start
mysqld_tries=$((mysqld_tries + 1))
success_test $mysqld_tries
@@ -58,7 +60,9 @@ while true; do
else
echo "MySQL server may not be installed. Trying to install it."
# Maybe it's not installed; try (re-)installing it and starting it
+ sleep 1
pacman --noconfirm -Sf mysql
+ sleep 1
/etc/rc.d/mysqld start
mysqld_tries=$((mysqld_tries + 1))
success_test $mysqld_tries