Magellan Linux

Diff of /trunk/installer-simple/functions/hwdetection.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2404 by niro, Fri Jan 3 14:07:34 2014 UTC revision 2405 by niro, Tue Jan 7 13:22:38 2014 UTC
# Line 57  get_hwinfo() Line 57  get_hwinfo()
57  # special memory case  # special memory case
58  get_hwinfo_memory()  get_hwinfo_memory()
59  {  {
60   local memory=$(hwinfo --memory  | grep "Memory Size" | cut -d: -f2 | sed "s:\ ::")   local memory=$(hwinfo --memory  | grep "Memory Size" | sed 's:.*\:\ \(.*\):\1:')
61   echo "${memory}"   echo "${memory}"
62  }  }
63    
# Line 65  get_hwinfo_memory() Line 65  get_hwinfo_memory()
65  # special smp case  # special smp case
66  get_hwinfo_smp()  get_hwinfo_smp()
67  {  {
68   local smp=$(hwinfo --smp  | grep "SMP support:" | cut -d: -f2 | sed "s:\ ::")   local memory=$(hwinfo --memory  | grep "Memory Size" | cut -d: -f2 | sed "s:\ ::")
69   echo "${smp}"   echo "${smp}"
70  }  }
71    

Legend:
Removed from v.2404  
changed lines
  Added in v.2405