--- mcore-src/trunk/mcore-tools/src/include/register.global.class.in	2015/12/16 14:42:45	2701
+++ mcore-src/trunk/mcore-tools/src/include/register.global.class.in	2015/12/18 10:48:29	2719
@@ -49,19 +49,25 @@
 		SSLSAY_PORT="6666"
 		nsslsay_fingerprint "register '${serial}'"
 
+		# register the client as online
+		serial_id=$(mysqldo "select serial from state_connected where serial=${serial};")
+		if [[ -n ${serial_id} ]]
+		then
+			mysqldo "update state_connected set ip='${ip_address}', mac='${mac_address}', mtime='${mtime}' where serial=${serial};"
+		else
+			mysqldo "insert into state_connected(serial,ip,mac,mtime) values('${serial}','${ip_address}','${mac_address}','${mtime}');"
+		fi
+
 		# get netboot state
 		nsslsay_queue_init
 		nsslsay_queue_add "nocolors"
 		nsslsay_queue_add "get version.netboot"
 		netboot=$(control_client "${serial}" run-queue)
-
-		# register the client as online
+		# update netboot state
 		serial_id=$(mysqldo "select serial from state_connected where serial=${serial};")
 		if [[ -n ${serial_id} ]]
 		then
-			mysqldo "update state_connected set ip='${ip_address}', mac='${mac_address}', mtime='${mtime}', netboot='${netboot}' where serial=${serial};"
-		else
-			mysqldo "insert into state_connected(serial,ip,mac,mtime,netboot) values('${serial}','${ip_address}','${mac_address}','${mtime}', '${netboot}');"
+			mysqldo "update state_connected set netboot='${netboot}' where serial=${serial};"
 		fi
 
 		# update tools and os version info
@@ -103,7 +109,7 @@
 	decho "iface='${iface}'"
 	decho "mac_address='${mac_address}'"
 
-	decho "register '${mac_address}'"
+	decho "register '${mac_address}' '${iface_ip}'"
 	nsslsay_fingerprint "register '${mac_address}' '${iface_ip}'"
 }