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 2492 by niro, Thu Sep 10 13:29:34 2015 UTC revision 2493 by niro, Thu Sep 10 13:43:13 2015 UTC
    # Line 27  set_hardware_detect() Line 27  set_hardware_detect()
    27   if [[ -z $(mysqldo "select networking from cfg_network where serial=${serial};") ]]   if [[ -z $(mysqldo "select networking from cfg_network where serial=${serial};") ]]
    28   then   then
    29   # set network to dhcp   # set network to dhcp
    30     decho "networking='dhcp'"
    31   import_resource cfg_network "${serial}" networking "dhcp"   import_resource cfg_network "${serial}" networking "dhcp"
    32   fi   fi
    33   if [[ -z $(mysqldo "select hostname from cfg_network where serial=${serial};") ]]   if [[ -z $(mysqldo "select hostname from cfg_network where serial=${serial};") ]]
    34   then   then
    35   # set hostname to MCORE_DEFAULT_HOSTNAME   # set hostname to MCORE_DEFAULT_HOSTNAME
    36     decho "hostname='${MCORE_DEFAULT_HOSTNAME}'"
    37   import_resource cfg_network "${serial}" hostname "${MCORE_DEFAULT_HOSTNAME}"   import_resource cfg_network "${serial}" hostname "${MCORE_DEFAULT_HOSTNAME}"
    38   fi   fi
    39   if [[ -z $(mysqldo "select domain from cfg_network where serial=${serial};") ]]   if [[ -z $(mysqldo "select domain from cfg_network where serial=${serial};") ]]
    40   then   then
    41   # set domain to MCORE_DEFAULT_DOMAIN   # set domain to MCORE_DEFAULT_DOMAIN
    42     decho "hostname='${MCORE_DEFAULT_DOMAIN}'"
    43   import_resource cfg_network "${serial}" domain "${MCORE_DEFAULT_DOMAIN}"   import_resource cfg_network "${serial}" domain "${MCORE_DEFAULT_DOMAIN}"
    44   fi   fi
    45    
    # Line 54  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.2492  
    changed lines
      Added in v.2493