Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/src/include/register.global.class.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2719 by niro, Fri Dec 18 10:48:29 2015 UTC revision 2784 by niro, Wed Feb 17 10:11:31 2016 UTC
# Line 10  validate_client() Line 10  validate_client()
10   local os   local os
11   local tools   local tools
12   local netboot   local netboot
13     local location
14    
15   if [[ -z ${mac_address} ]]   if [[ -z ${mac_address} ]]
16   then   then
# Line 70  validate_client() Line 71  validate_client()
71   mysqldo "update state_connected set netboot='${netboot}' where serial=${serial};"   mysqldo "update state_connected set netboot='${netboot}' where serial=${serial};"
72   fi   fi
73    
74     # get location from cmdline and update the client_serials.location entry
75     nsslsay_queue_init
76     nsslsay_queue_add "nocolors"
77     nsslsay_queue_add "get system.cmdline MCORE_LOCATION="
78     location=$(control_client "${serial}" run-queue)
79     # update location
80     if [[ -n ${location} ]]
81     then
82     mysqldo "update client_serials set location='${location}' where serial=${serial};"
83     fi
84    
85   # update tools and os version info   # update tools and os version info
86   nsslsay_queue_init   nsslsay_queue_init
87   nsslsay_queue_add "nocolors"   nsslsay_queue_add "nocolors"
# Line 100  register_client() Line 112  register_client()
112   local mac_address   local mac_address
113    
114   control_server_ip=$(dns_to_ip ${MCORE_CONTROL_SERVER})   control_server_ip=$(dns_to_ip ${MCORE_CONTROL_SERVER})
115     if [[ -z ${control_server_ip} ]]
116     then
117     decho "Could not resolve control server ip, dns_to_ip(${MCORE_CONTROL_SERVER}) failed"
118     return 1
119     fi
120   iface_ip=$(iface_for_remote_addr ${control_server_ip})   iface_ip=$(iface_for_remote_addr ${control_server_ip})
121     if [[ -z ${iface_ip} ]]
122     then
123     decho "Could not resolve interface ip, iface_ip(${control_server_ip}) failed"
124     return 1
125     fi
126   iface=$(iface_for_ip ${iface_ip})   iface=$(iface_for_ip ${iface_ip})
127     if [[ -z ${iface} ]]
128     then
129     decho "Could not resolve interface for referencing ip address, iface_for_ip(${iface_ip}) failed"
130     return 1
131     fi
132   mac_address=$(mac_for_iface ${iface})   mac_address=$(mac_for_iface ${iface})
133     if [[ -z ${mac_address} ]]
134     then
135     decho "Could not resolve mac address, mac_for_iface(${iface}) failed"
136     return 1
137     fi
138    
139   decho "MCORE_CONTROL_SERVER='${MCORE_CONTROL_SERVER}'"   decho "MCORE_CONTROL_SERVER='${MCORE_CONTROL_SERVER}'"
140   decho "iface_ip='${iface_ip}'"   decho "iface_ip='${iface_ip}'"

Legend:
Removed from v.2719  
changed lines
  Added in v.2784