--- alx-src/trunk/alxconfig-ng/init.d/alxsetstate	2005/05/11 12:25:39	274
+++ alx-src/trunk/alxconfig-ng/init.d/alxsetstate	2005/08/17 21:20:12	283
@@ -9,7 +9,7 @@
 #%before:
 #%after:
 
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsetstate,v 1.6 2005-05-11 12:25:39 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsetstate,v 1.7 2005-08-17 21:20:12 niro Exp $
 
 source /etc/sysconfig/rc
 source $rc_functions
@@ -76,8 +76,6 @@
 				state='${ALX_STATE}',
 				mtime='${CUR_MTIME}'
 			where serial=${ALX_SERIAL};"
-
-		evaluate_retval
 	else
 		#run an insert
 
@@ -103,7 +101,6 @@
 				'${ALX_STATE}',
 				'${CUR_MTIME}'
 			);"
-		evaluate_retval
 	fi
 }
 
@@ -137,14 +134,24 @@
 
 case $1 in
 	start)
-		
+		# check if mysql server is reachable
+		# if not abort this script
+		reach_mysql_server || exit 1
+
 		set_current_network_state
+		evaluate_retval
 		;;
 
 	stop)
+		# check if mysql server is reachable
+		# if not abort this script
+		reach_mysql_server || exit 1
+
 		unset_alx_connected
+		evaluate_retval
 		;;
 	*)
 		echo "Usage: $0 {start|stop} ..."
 		;;
 esac
+