--- mcore-src/trunk/mcore-tools/src/modules/hwinfo/hardware.control.class.in 2015/09/10 13:40:12 2492 +++ mcore-src/trunk/mcore-tools/src/modules/hwinfo/hardware.control.class.in 2015/09/10 13:43:13 2493 @@ -27,16 +27,19 @@ if [[ -z $(mysqldo "select networking from cfg_network where serial=${serial};") ]] then # set network to dhcp + decho "networking='dhcp'" import_resource cfg_network "${serial}" networking "dhcp" fi if [[ -z $(mysqldo "select hostname from cfg_network where serial=${serial};") ]] then # set hostname to MCORE_DEFAULT_HOSTNAME + decho "hostname='${MCORE_DEFAULT_HOSTNAME}'" import_resource cfg_network "${serial}" hostname "${MCORE_DEFAULT_HOSTNAME}" fi if [[ -z $(mysqldo "select domain from cfg_network where serial=${serial};") ]] then # set domain to MCORE_DEFAULT_DOMAIN + decho "hostname='${MCORE_DEFAULT_DOMAIN}'" import_resource cfg_network "${serial}" domain "${MCORE_DEFAULT_DOMAIN}" fi @@ -54,7 +57,7 @@ nsslsay_queue_init nsslsay_queue_add "nocolors" - nsslsay_queue_add "get hardware.detect info minitor" + nsslsay_queue_add "get hardware.detect info monitor" monitor_info=$(control_client "${serial}" run-queue) monitor_resolution="${monitor_info##*;}" if [[ -n ${monitor_resolution} ]]