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 2496 by niro, Thu Sep 10 13:53:32 2015 UTC
    # Line 9  set_hardware_detect() Line 9  set_hardware_detect()
    9    
    10   local cmd   local cmd
    11   local netcard_driver   local netcard_driver
    12     local networking
    13     local hostname
    14     local domain
    15   local graphic_driver   local graphic_driver
    16   local monitor_info   local monitor_info
    17   local monitor_resolution   local monitor_resolution
    # Line 19  set_hardware_detect() Line 22  set_hardware_detect()
    22   netcard_driver=$(control_client "${serial}" run-queue)   netcard_driver=$(control_client "${serial}" run-queue)
    23   if [[ -n ${netcard_driver} ]]   if [[ -n ${netcard_driver} ]]
    24   then   then
    25   decho "netcard_driver='${netcard_driver}'"   decho "netcard_driver='${netcard_driver}'"
    26   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"  
    27   else   else
    28   decho "no netcard_driver found"   decho "no netcard_driver found"
    29   fi   fi
    30     networking=$(mysqldo "select networking from cfg_network where serial=${serial};")
    31     if [[ -z ${networking} ]] || [[ ${networking} = NULL ]]
    32     then
    33     # set network to dhcp
    34     decho "networking='dhcp'"
    35     import_resource cfg_network "${serial}" networking "dhcp"
    36     fi
    37     hostname=$(mysqldo "select hostname from cfg_network where serial=${serial};")
    38     if [[ -z ${hostname} ]] || [[ ${hostname} = NULL ]]
    39     then
    40     # set hostname to MCORE_DEFAULT_HOSTNAME
    41     decho "hostname='${MCORE_DEFAULT_HOSTNAME}'"
    42     import_resource cfg_network "${serial}" hostname "${MCORE_DEFAULT_HOSTNAME}"
    43     fi
    44     domain=$(mysqldo "select domain from cfg_network where serial=${serial};")
    45     if [[ -z ${domain} ]] || [[ ${domain} = NULL ]]
    46     then
    47     # set domain to MCORE_DEFAULT_DOMAIN
    48     decho "hostname='${MCORE_DEFAULT_DOMAIN}'"
    49     import_resource cfg_network "${serial}" domain "${MCORE_DEFAULT_DOMAIN}"
    50     fi
    51    
    52   nsslsay_queue_init   nsslsay_queue_init
    53   nsslsay_queue_add "nocolors"   nsslsay_queue_add "nocolors"
    # Line 41  set_hardware_detect() Line 63  set_hardware_detect()
    63    
    64   nsslsay_queue_init   nsslsay_queue_init
    65   nsslsay_queue_add "nocolors"   nsslsay_queue_add "nocolors"
    66   nsslsay_queue_add "get hardware.detect info minitor"   nsslsay_queue_add "get hardware.detect info monitor"
    67   monitor_info=$(control_client "${serial}" run-queue)   monitor_info=$(control_client "${serial}" run-queue)
    68   monitor_resolution="${monitor_info##*;}"   monitor_resolution="${monitor_info##*;}"
    69   if [[ -n ${monitor_resolution} ]]   if [[ -n ${monitor_resolution} ]]
    Legend:
    Removed from v.2487  
    changed lines
      Added in v.2496