Magellan Linux

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 2495 by niro, Thu Sep 10 13:50:46 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 24  set_hardware_detect() Line 27  set_hardware_detect()
27   else   else
28   decho "no netcard_driver found"   decho "no netcard_driver found"
29   fi   fi
30   if [[ -z $(mysqldo "select networking from cfg_network where serial=${serial};") ]]   networking=$(mysqldo "select networking from cfg_network where serial=${serial};")
31     if [[ -z ${networking} ]] || [[ ${networking} = NULL ]]
32   then   then
33   # set network to dhcp   # set network to dhcp
34   decho "networking='dhcp'"   decho "networking='dhcp'"
35   import_resource cfg_network "${serial}" networking "dhcp"   import_resource cfg_network "${serial}" networking "dhcp"
36   fi   fi
37   if [[ -z $(mysqldo "select hostname from cfg_network where serial=${serial};") ]]   hostname=$(mysqldo "select hostname from cfg_network where serial=${serial};")
38     if [[ -z ${hostname} ]] || [[ ${hostname} = NULL ]]
39   then   then
40   # set hostname to MCORE_DEFAULT_HOSTNAME   # set hostname to MCORE_DEFAULT_HOSTNAME
41   decho "hostname='${MCORE_DEFAULT_HOSTNAME}'"   decho "hostname='${MCORE_DEFAULT_HOSTNAME}'"
42   import_resource cfg_network "${serial}" hostname "${MCORE_DEFAULT_HOSTNAME}"   import_resource cfg_network "${serial}" hostname "${MCORE_DEFAULT_HOSTNAME}"
43   fi   fi
44   if [[ -z $(mysqldo "select domain from cfg_network where serial=${serial};") ]]   domain=$(mysqldo "select domain from cfg_network where serial=${serial};")
45     if [[ -z ${domain} ]] || [[ ${domain} = NULL ]]
46   then   then
47   # set domain to MCORE_DEFAULT_DOMAIN   # set domain to MCORE_DEFAULT_DOMAIN
48   decho "hostname='${MCORE_DEFAULT_DOMAIN}'"   decho "hostname='${MCORE_DEFAULT_DOMAIN}'"

Legend:
Removed from v.2495  
changed lines
  Added in v.2496