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 2435 by niro, Thu Sep 3 12:35:41 2015 UTC revision 2768 by niro, Wed Feb 10 15:29:02 2016 UTC
# Line 3  Line 3 
3  validate_client()  validate_client()
4  {  {
5   local mac_address="$1"   local mac_address="$1"
6     local ip_address="$2"
7   local serial   local serial
8   local mtime   local mtime
9     local serial_id
10     local os
11     local tools
12     local netboot
13     local location
14    
15   if [[ -z ${mac_address} ]]   if [[ -z ${mac_address} ]]
16   then   then
# Line 12  validate_client() Line 18  validate_client()
18   return 1   return 1
19   fi   fi
20    
21     if [[ -z ${ip_address} ]]
22     then
23     eecho "Error: No ip_address given"
24     return 1
25     fi
26    
27     decho "registering mac_address='${mac_address}'"
28     decho "registering ip_address='${ip_address}'"
29    
30   # first check if mac is registered   # first check if mac is registered
31   serial=$(mysqldo "select serial from client_serials where mac='${mac_address}'")   serial=$(mysqldo "select serial from client_serials where mac='${mac_address}'")
32    
33     # current mtime
34     mtime=$(date +%s)
35    
36   if [[ -z ${serial} ]]   if [[ -z ${serial} ]]
37   then   then
  mtime=$(date +%s)  
   
38   # request a new serial; one command now (cause must be done in the same session)   # request a new serial; one command now (cause must be done in the same session)
39   serial=$(mysqldo "insert into client_serials (mtime, mac) values('${mtime}','${mac_address}'); select last_insert_id();")   serial=$(mysqldo "insert into client_serials (mtime, mac) values('${mtime}','${mac_address}'); select last_insert_id();")
40   fi   fi
# Line 27  validate_client() Line 43  validate_client()
43   then   then
44   return 1   return 1
45   else   else
46   echo "serial='${serial}'"   decho "serial='${serial}'"
47     rvecho "${serial}"
48    
49     SSLSAY_IP="${ip_address}"
50     SSLSAY_PORT="6666"
51     nsslsay_fingerprint "register '${serial}'"
52    
53     # register the client as online
54     serial_id=$(mysqldo "select serial from state_connected where serial=${serial};")
55     if [[ -n ${serial_id} ]]
56     then
57     mysqldo "update state_connected set ip='${ip_address}', mac='${mac_address}', mtime='${mtime}' where serial=${serial};"
58     else
59     mysqldo "insert into state_connected(serial,ip,mac,mtime) values('${serial}','${ip_address}','${mac_address}','${mtime}');"
60     fi
61    
62     # get netboot state
63     nsslsay_queue_init
64     nsslsay_queue_add "nocolors"
65     nsslsay_queue_add "get version.netboot"
66     netboot=$(control_client "${serial}" run-queue)
67     # update netboot state
68     serial_id=$(mysqldo "select serial from state_connected where serial=${serial};")
69     if [[ -n ${serial_id} ]]
70     then
71     mysqldo "update state_connected set netboot='${netboot}' where serial=${serial};"
72     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
86     nsslsay_queue_init
87     nsslsay_queue_add "nocolors"
88     nsslsay_queue_add "get version.os"
89     os=$(control_client "${serial}" run-queue)
90     import_resource client_version "${serial}" os "${os}"
91     nsslsay_queue_init
92     nsslsay_queue_add "nocolors"
93     nsslsay_queue_add "get version.tools"
94     tools=$(control_client "${serial}" run-queue)
95     import_resource client_version "${serial}" utils "${tools}"
96    
97     # run hardware detection
98     if is_provided hardware
99     then
100     run_hardware_detect "${serial}"
101     fi
102    
103   return 0   return 0
104   fi   fi
105  }  }
# Line 44  register_client() Line 116  register_client()
116   iface=$(iface_for_ip ${iface_ip})   iface=$(iface_for_ip ${iface_ip})
117   mac_address=$(mac_for_iface ${iface})   mac_address=$(mac_for_iface ${iface})
118    
119   echo "DEBUG: MCORE_CONTROL_SERVER='${MCORE_CONTROL_SERVER}'"   decho "MCORE_CONTROL_SERVER='${MCORE_CONTROL_SERVER}'"
120   echo "DEBUG: iface_ip='${iface_ip}'"   decho "iface_ip='${iface_ip}'"
121   echo "DEBUG: iface='${iface}'"   decho "iface='${iface}'"
122   echo "DEBUG: mac_address='${mac_address}'"   decho "mac_address='${mac_address}'"
123    
124     decho "register '${mac_address}' '${iface_ip}'"
125     nsslsay_fingerprint "register '${mac_address}' '${iface_ip}'"
126    }
127    
128    register_client_local()
129    {
130     local serial="$1"
131    
132     if [[ -z ${serial} ]]
133     then
134     eecho "No serial given"
135     return 1
136     fi
137    
138   echo "register '${mac_address}'"   install -d "${MCORE_CONFIG_PATH}"
139   nsslsay_fingerprint "register '${mac_address}'"   CONFIG="${MCORE_CONFIG_PATH}/serial"
140     clearconfig
141     addconfig "CLIENT_SERIAL=\"${serial}\""
142  }  }

Legend:
Removed from v.2435  
changed lines
  Added in v.2768