--- alx-src/trunk/alxconfig-ng/init.d/alxsetstate	2005/03/08 23:02:49	222
+++ alx-src/trunk/alxconfig-ng/init.d/alxsetstate	2005/05/11 12:25:39	274
@@ -9,15 +9,15 @@
 #%before:
 #%after:
 
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsetstate,v 1.2 2005-03-08 23:02:49 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsetstate,v 1.6 2005-05-11 12:25:39 niro Exp $
 
 source /etc/sysconfig/rc
 source $rc_functions
 
 #mysql settings
-source /etc/alx-config/config.rc
-source /opt/alx-config/functions/mysqlfunctions
-source /opt/alx-config/functions/alx-mysql-functions
+source /etc/alxconfig-ng/config.rc
+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
@@ -29,9 +29,9 @@
 unset ALX_SERIAL ALX_STATE
 
 #get current system state
-if [ -f /etc/alx-config/state/state ]
+if [ -f /etc/alxconfig-ng/state/state ]
 then
-	source /etc/alx-config/state/state
+	source /etc/alxconfig-ng/state/state
 else
 	ALX_STATE=error
 fi
@@ -113,6 +113,9 @@
 # nice name is alx_connected_state or sth like this
 unset_alx_connected(){
 	local SQL_OPTS
+	local CUR_MAC
+
+	CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
 
 	echo -e ${COLMAGENTA}"Unregister system from database"${COLDEFAULT}
 
@@ -124,9 +127,9 @@
 ########### starts here ################
 
 #first of all get current system serial
-if [ -f /etc/alx-config/serial ]
+if [ -f /etc/alxconfig-ng/serial ]
 then
-	source /etc/alx-config/serial
+	source /etc/alxconfig-ng/serial
 else
 	ALX_SERIAL=0
 fi
@@ -144,4 +147,4 @@
 	*)
 		echo "Usage: $0 {start|stop} ..."
 		;;
-esac
\ No newline at end of file
+esac