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 2500 by niro, Fri Sep 11 08:20:34 2015 UTC revision 2618 by niro, Fri Sep 25 07:35:56 2015 UTC
    # Line 18  run_hardware_detect() Line 18  run_hardware_detect()
    18   local monitor_resolution   local monitor_resolution
    19   local keymap   local keymap
    20   local hwdetected   local hwdetected
    21     local auth
    22   local i   local i
    23    
    24   if [[ -z ${serial} ]]   if [[ -z ${serial} ]]
    # Line 38  run_hardware_detect() Line 39  run_hardware_detect()
    39    
    40   nsslsay_queue_init   nsslsay_queue_init
    41   nsslsay_queue_add "nocolors"   nsslsay_queue_add "nocolors"
    42   nsslsay_queue_add "get hardware.detect driver netcard"   #nsslsay_queue_add "get hardware.detect driver netcard"
    43     nsslsay_queue_add "get hardware.detect driver connected-iface"
    44   netcard_driver=$(control_client "${serial}" run-queue)   netcard_driver=$(control_client "${serial}" run-queue)
    45   if [[ -n ${netcard_driver} ]]   if [[ -n ${netcard_driver} ]]
    46   then   then
    # Line 105  run_hardware_detect() Line 107  run_hardware_detect()
    107   # now setup some empty database entries if the does not exist   # now setup some empty database entries if the does not exist
    108   for i in user root vnc   for i in user root vnc
    109   do   do
    110   if [[ -z $(mysqldo "select ${i} from client_auth where serial=${serial};") ]]   auth=$(mysqldo "select ${i} from client_auth where serial=${serial};")
    111     if [[ -z ${auth} ]] || [[ ${auth} = NULL ]]
    112   then   then
    113   decho "set empty ${i} pass"   decho "set empty ${i} pass"
    114   import_resource client_auth "${serial}" "${i}" ""   import_resource client_auth "${serial}" "${i}" ""
    115   fi   fi
    116   done   done
    117    
    118     # create an empty screensaver entry
    119     decho "set empty screensaver"
    120     import_resource cfg_screensaver "${serial}" "screensaver" ""
    121    
    122     # enable vnc service
    123     decho "enable vnc service"
    124     import_resource cfg_vnc "${serial}" "service" "1"
    125    
    126   # update the hwdetected flags   # update the hwdetected flags
    127   import_resource client_serials "${serial}" hwdetected 1   import_resource client_serials "${serial}" hwdetected 1
    128  }  }
    Legend:
    Removed from v.2500  
    changed lines
      Added in v.2618