--- mcore-src/trunk/mcore-tools/src/include/register.global.class.in	2015/12/16 14:15:27	2700
+++ mcore-src/trunk/mcore-tools/src/include/register.global.class.in	2015/12/16 14:42:45	2701
@@ -49,13 +49,19 @@
 		SSLSAY_PORT="6666"
 		nsslsay_fingerprint "register '${serial}'"
 
+		# 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
 		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};"
+			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) values('${serial}','${ip_address}','${mac_address}','${mtime}');"
+			mysqldo "insert into state_connected(serial,ip,mac,mtime,netboot) values('${serial}','${ip_address}','${mac_address}','${mtime}', '${netboot}');"
 		fi
 
 		# update tools and os version info
@@ -70,13 +76,6 @@
 		tools=$(control_client "${serial}" run-queue)
 		import_resource client_version "${serial}" utils "${tools}"
 
-		# update netboot state too
-		nsslsay_queue_init
-		nsslsay_queue_add "nocolors"
-		nsslsay_queue_add "get version.netboot"
-		netboot=$(control_client "${serial}" run-queue)
-		import_resource state_connected "${serial}" netboot "${netboot}"
-
 		# run hardware detection
 		if is_provided hardware
 		then