Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/include/register.global.class.in

    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 2787 by niro, Wed Feb 17 10:49:12 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 94  validate_client() Line 106  validate_client()
    106    
    107  register_client()  register_client()
    108  {  {
    109     local control_server
    110   local control_server_ip   local control_server_ip
    111   local iface_ip   local iface_ip
    112   local iface   local iface
    113   local mac_address   local mac_address
    114    
    115   control_server_ip=$(dns_to_ip ${MCORE_CONTROL_SERVER})   control_server=$(mcore-controlserver)
    116     if [[ $? != 0 ]]
    117     then
    118     decho "Could not communicate with the controlserver"
    119     return 1
    120     fi
    121    
    122     control_server_ip=$(dns_to_ip ${control_server})
    123     if [[ -z ${control_server_ip} ]]
    124     then
    125     decho "Could not resolve control server ip, dns_to_ip(${control_server}) failed"
    126     return 1
    127     fi
    128   iface_ip=$(iface_for_remote_addr ${control_server_ip})   iface_ip=$(iface_for_remote_addr ${control_server_ip})
    129     if [[ -z ${iface_ip} ]]
    130     then
    131     decho "Could not resolve interface ip, iface_ip(${control_server_ip}) failed"
    132     return 1
    133     fi
    134   iface=$(iface_for_ip ${iface_ip})   iface=$(iface_for_ip ${iface_ip})
    135     if [[ -z ${iface} ]]
    136     then
    137     decho "Could not resolve interface for referencing ip address, iface_for_ip(${iface_ip}) failed"
    138     return 1
    139     fi
    140   mac_address=$(mac_for_iface ${iface})   mac_address=$(mac_for_iface ${iface})
    141     if [[ -z ${mac_address} ]]
    142     then
    143     decho "Could not resolve mac address, mac_for_iface(${iface}) failed"
    144     return 1
    145     fi
    146    
    147   decho "MCORE_CONTROL_SERVER='${MCORE_CONTROL_SERVER}'"   decho "control_server='${control_server}'"
    148   decho "iface_ip='${iface_ip}'"   decho "iface_ip='${iface_ip}'"
    149   decho "iface='${iface}'"   decho "iface='${iface}'"
    150   decho "mac_address='${mac_address}'"   decho "mac_address='${mac_address}'"
    Legend:
    Removed from v.2719  
    changed lines
      Added in v.2787