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 2457 by niro, Thu Sep 3 14:42:38 2015 UTC revision 2699 by niro, Wed Dec 16 14:11:07 2015 UTC
    # Line 7  validate_client() Line 7  validate_client()
    7   local serial   local serial
    8   local mtime   local mtime
    9   local serial_id   local serial_id
    10     local os
    11     local tools
    12     local netboot
    13    
    14   if [[ -z ${mac_address} ]]   if [[ -z ${mac_address} ]]
    15   then   then
    # Line 26  validate_client() Line 29  validate_client()
    29   # first check if mac is registered   # first check if mac is registered
    30   serial=$(mysqldo "select serial from client_serials where mac='${mac_address}'")   serial=$(mysqldo "select serial from client_serials where mac='${mac_address}'")
    31    
    32     # current mtime
    33     mtime=$(date +%s)
    34    
    35   if [[ -z ${serial} ]]   if [[ -z ${serial} ]]
    36   then   then
      mtime=$(date +%s)  
       
    37   # 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)
    38   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();")
    39   fi   fi
    # Line 54  validate_client() Line 58  validate_client()
    58   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}');"
    59   fi   fi
    60    
    61     # update tools and os version info
    62     nsslsay_queue_init
    63     nsslsay_queue_add "nocolors"
    64     nsslsay_queue_add "get version.os"
    65     os=$(control_client "${serial}" run-queue)
    66     import_resource client_version "${serial}" os "${os}"
    67     nsslsay_queue_init
    68     nsslsay_queue_add "nocolors"
    69     nsslsay_queue_add "get version.tools"
    70     tools=$(control_client "${serial}" run-queue)
    71     import_resource client_version "${serial}" utils "${tools}"
    72    
    73     # update netboot state too
    74     nsslsay_queue_init
    75     nsslsay_queue_add "nocolors"
    76     nsslsay_queue_add "get version.netboot"
    77     netboot=$(control_client "${serial}" run-queue)
    78     import_resource state_connected "${serial}" netboot "${netboot}"
    79    
    80     # run hardware detection
    81     if is_provided hardware
    82     then
    83     run_hardware_detect "${serial}"
    84     fi
    85    
    86   return 0   return 0
    87   fi   fi
    88  }  }
    # Line 89  register_client_local() Line 118  register_client_local()
    118   return 1   return 1
    119   fi   fi
    120    
    121     install -d "${MCORE_CONFIG_PATH}"
    122   CONFIG="${MCORE_CONFIG_PATH}/serial"   CONFIG="${MCORE_CONFIG_PATH}/serial"
    123   clearconfig   clearconfig
    124   addconfig "CLIENT_SERIAL=\"${serial}\""   addconfig "CLIENT_SERIAL=\"${serial}\""
    Legend:
    Removed from v.2457  
    changed lines
      Added in v.2699