Magellan Linux

  • Back to homepage
    • /[mcore-svn]/mcore-src/trunk/mcore-tools/src/modules/hwinfo/hardware.control.class.in

    Diff of /mcore-src/trunk/mcore-tools/src/modules/hwinfo/hardware.control.class.in

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

    revision 2487 by niro, Thu Sep 10 13:05:37 2015 UTC revision 2495 by niro, Thu Sep 10 13:50:46 2015 UTC
    # Line 19  set_hardware_detect() Line 19  set_hardware_detect()
    19   netcard_driver=$(control_client "${serial}" run-queue)   netcard_driver=$(control_client "${serial}" run-queue)
    20   if [[ -n ${netcard_driver} ]]   if [[ -n ${netcard_driver} ]]
    21   then   then
    22   decho "netcard_driver='${netcard_driver}'"   decho "netcard_driver='${netcard_driver}'"
    23   import_resource cfg_network "${serial}" module "${netcard_driver}"   import_resource cfg_network "${serial}" module "${netcard_driver}"
      # set network to dhcp  
      import_resource cfg_network "${serial}" networking "dhcp"  
    24   else   else
    25   decho "no netcard_driver found"   decho "no netcard_driver found"
    26   fi   fi
    27     if [[ -z $(mysqldo "select networking from cfg_network where serial=${serial};") ]]
    28     then
    29     # set network to dhcp
    30     decho "networking='dhcp'"
    31     import_resource cfg_network "${serial}" networking "dhcp"
    32     fi
    33     if [[ -z $(mysqldo "select hostname from cfg_network where serial=${serial};") ]]
    34     then
    35     # set hostname to MCORE_DEFAULT_HOSTNAME
    36     decho "hostname='${MCORE_DEFAULT_HOSTNAME}'"
    37     import_resource cfg_network "${serial}" hostname "${MCORE_DEFAULT_HOSTNAME}"
    38     fi
    39     if [[ -z $(mysqldo "select domain from cfg_network where serial=${serial};") ]]
    40     then
    41     # set domain to MCORE_DEFAULT_DOMAIN
    42     decho "hostname='${MCORE_DEFAULT_DOMAIN}'"
    43     import_resource cfg_network "${serial}" domain "${MCORE_DEFAULT_DOMAIN}"
    44     fi
    45    
    46   nsslsay_queue_init   nsslsay_queue_init
    47   nsslsay_queue_add "nocolors"   nsslsay_queue_add "nocolors"
    # Line 41  set_hardware_detect() Line 57  set_hardware_detect()
    57    
    58   nsslsay_queue_init   nsslsay_queue_init
    59   nsslsay_queue_add "nocolors"   nsslsay_queue_add "nocolors"
    60   nsslsay_queue_add "get hardware.detect info minitor"   nsslsay_queue_add "get hardware.detect info monitor"
    61   monitor_info=$(control_client "${serial}" run-queue)   monitor_info=$(control_client "${serial}" run-queue)
    62   monitor_resolution="${monitor_info##*;}"   monitor_resolution="${monitor_info##*;}"
    63   if [[ -n ${monitor_resolution} ]]   if [[ -n ${monitor_resolution} ]]
    Legend:
    Removed from v.2487  
    changed lines
      Added in v.2495