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 2699 by niro, Wed Dec 16 14:11:07 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 58  validate_client() Line 59  validate_client()
    59   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) values('${serial}','${ip_address}','${mac_address}','${mtime}');"
    60   fi   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   # update tools and os version info
    86   nsslsay_queue_init   nsslsay_queue_init
    87   nsslsay_queue_add "nocolors"   nsslsay_queue_add "nocolors"
    # Line 70  validate_client() Line 94  validate_client()
    94   tools=$(control_client "${serial}" run-queue)   tools=$(control_client "${serial}" run-queue)
    95   import_resource client_version "${serial}" utils "${tools}"   import_resource client_version "${serial}" utils "${tools}"
    96    
      # update netboot state too  
      nsslsay_queue_init  
      nsslsay_queue_add "nocolors"  
      nsslsay_queue_add "get version.netboot"  
      netboot=$(control_client "${serial}" run-queue)  
      import_resource state_connected "${serial}" netboot "${netboot}"  
       
    97   # run hardware detection   # run hardware detection
    98   if is_provided hardware   if is_provided hardware
    99   then   then
    # Line 95  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}'"
    141   decho "iface='${iface}'"   decho "iface='${iface}'"
    142   decho "mac_address='${mac_address}'"   decho "mac_address='${mac_address}'"
    143    
    144   decho "register '${mac_address}'"   decho "register '${mac_address}' '${iface_ip}'"
    145   nsslsay_fingerprint "register '${mac_address}' '${iface_ip}'"   nsslsay_fingerprint "register '${mac_address}' '${iface_ip}'"
    146  }  }
    147    
    Legend:
    Removed from v.2699  
    changed lines
      Added in v.2784