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 2496 by niro, Thu Sep 10 13:53:32 2015 UTC revision 2499 by niro, Fri Sep 11 07:36:40 2015 UTC
# Line 1  Line 1 
1  # $Id$  # $Id$
2    
3    provide hardware
4  require hwdetection  require hwdetection
5  require mysql  require mysql
6    
7  set_hardware_detect()  run_hardware_detect()
8  {  {
9   local serial="${CLASS_ARGV[0]}"   local serial="$1"
10    
11   local cmd   local cmd
12   local netcard_driver   local netcard_driver
# Line 15  set_hardware_detect() Line 16  set_hardware_detect()
16   local graphic_driver   local graphic_driver
17   local monitor_info   local monitor_info
18   local monitor_resolution   local monitor_resolution
19     local hwdetected
20    
21     if [[ -z ${serial} ]]
22     then
23     decho "No serial given"
24     return 1
25     fi
26    
27     # first check if hardware detect was already done
28     hwdetected=$(mysqldo "select hwdetected from client_serials where serial=${serial};")
29     if [[ ${hwdetected} = 1 ]]
30     then
31     decho "hardware detection already run, aborting"
32     return 0
33     else
34     decho "running hardware detection"
35     fi
36    
37   nsslsay_queue_init   nsslsay_queue_init
38   nsslsay_queue_add "nocolors"   nsslsay_queue_add "nocolors"
# Line 73  set_hardware_detect() Line 91  set_hardware_detect()
91   else   else
92   decho "no monitor_resolution found"   decho "no monitor_resolution found"
93   fi   fi
94    
95     # update the hwdetected flags
96     import_resource client_serials "${serial}" hwdetected 1
97    }
98    
99    set_hardware_detect()
100    {
101     local serial="${CLASS_ARGV[0]}"
102    
103     local cmd
104     local netcard_driver
105     local networking
106     local hostname
107     local domain
108     local graphic_driver
109     local monitor_info
110     local monitor_resolution
111     local hwdetected
112    
113     if [[ -z ${serial} ]]
114     then
115     eecho "No serial given"
116     return 1
117     fi
118    
119     run_hardware_detect "${serial}"
120  }  }

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