--- alx-src/branches/alxconf_20060908/init.d/alxsetstate	2010/12/09 11:24:17	1624
+++ alx-src/branches/alxconf-060/init.d/alxsetstate	2011/05/17 10:51:57	2141
@@ -1,6 +1,7 @@
 #!/bin/bash
+# $Id$
 
-#%rlevels: 3:s 4:s 5:s 0:k 6:k
+#%rlevels: 3:s 0:k
 #%start: 99
 #%stop: 01
 
@@ -9,21 +10,15 @@
 #%before:
 #%after:
 
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsetstate,v 1.10 2005-10-26 11:57:00 niro Exp $
-
-source /etc/sysconfig/rc
+source /etc/conf.d/rc
 source $rc_functions
 
 # mysql settings
 source /etc/alxconfig-ng/config.rc
+# helper functions
 source /usr/lib/alxconfig-ng/functions/mysqlfunctions
 source /usr/lib/alxconfig-ng/functions/serial_functions
-
-# check if mysql is available
-[ -x /usr/bin/mysql ] && MYSQL_ALX=true
-
-# other needed vars
-ALX_HW_DETECT=false
+source /usr/lib/alxconfig-ng/functions/common
 
 # unset vars which may kill us
 unset ALX_SERIAL ALX_STATE ALX_IFACE
@@ -49,7 +44,7 @@
 {
 	local CUR_IP CUR_MAC ID
 
-	echo -e ${COLMAGENTA}"Register system to database"${COLDEFAULT}
+	rc_mecho "Register system to database"
 
 	CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
 	CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
@@ -76,7 +71,7 @@
 		# nice status
 		$CURS_UP
 		$SET_WCOL
-		echo "[ U, State: ${ALX_STATE} ]"
+		rc_echo "[ SN: ${ALX_SERIAL}, U, ${ALX_STATE} ]"
 
 		mysqldo "update state_connected set
 				hostname='${HOSTNAME}',
@@ -91,7 +86,7 @@
 		# nice status
 		$CURS_UP
 		$SET_WCOL
-		echo "[ N, State: ${ALX_STATE} ]"
+		rc_echo "[ SN: ${ALX_SERIAL}, N, ${ALX_STATE} ]"
 
 		mysqldo "insert into state_connected(
 				serial,
@@ -123,7 +118,12 @@
 
 	CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
 
-	echo -e ${COLMAGENTA}"Unregister system from database"${COLDEFAULT}
+	rc_mecho "Unregister system from database"
+
+	# nice status
+	$CURS_UP
+	$SET_WCOL
+	rc_echo "[ SN: ${ALX_SERIAL} ]"
 
 	mysqldo "delete from state_connected where serial='${ALX_SERIAL}' and mac='${CUR_MAC}';"
 	evaluate_retval