--- mcore-src/trunk/mcore-tools/src/include/register.global.class.in 2015/09/10 14:08:40 2497 +++ mcore-src/trunk/mcore-tools/src/include/register.global.class.in 2015/12/16 14:42:45 2701 @@ -7,6 +7,9 @@ local serial local mtime local serial_id + local os + local tools + local netboot if [[ -z ${mac_address} ]] then @@ -46,19 +49,37 @@ 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 + nsslsay_queue_init + nsslsay_queue_add "nocolors" + nsslsay_queue_add "get version.os" + os=$(control_client "${serial}" run-queue) + import_resource client_version "${serial}" os "${os}" + nsslsay_queue_init + nsslsay_queue_add "nocolors" + nsslsay_queue_add "get version.tools" + tools=$(control_client "${serial}" run-queue) + import_resource client_version "${serial}" utils "${tools}" + # run hardware detection if is_provided hardware then - set_hardware_detect "${serial}" + run_hardware_detect "${serial}" fi return 0