Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/src/modules/basic-video/graphic.control.class.in

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

revision 2814 by niro, Tue Feb 2 14:11:44 2016 UTC revision 2815 by niro, Fri Apr 7 09:13:15 2017 UTC
# Line 135  push_firstboot_10_graphic_driver() Line 135  push_firstboot_10_graphic_driver()
135   local serial="$1"   local serial="$1"
136   local graphic_driver   local graphic_driver
137    
138   nsslsay_queue_init   if [[ ${MCORE_GRAPHIC_HWDETECT_DEEP} = 1 ]]
  nsslsay_queue_add "nocolors"  
  nsslsay_queue_add "get hardware.detect driver graphic"  
  graphic_driver=$(control_client "${serial}" run-queue)  
  if [[ -n ${graphic_driver} ]]  
139   then   then
140   decho "graphic_driver='${graphic_driver}'"   nsslsay_queue_init
141   import_resource cfg_graphic "${serial}" module "${graphic_driver}"   nsslsay_queue_add "nocolors"
142     nsslsay_queue_add "get hardware.detect driver graphic"
143     graphic_driver=$(control_client "${serial}" run-queue)
144     if [[ -n ${graphic_driver} ]]
145     then
146     decho "graphic_driver='${graphic_driver}'"
147     import_resource cfg_graphic "${serial}" module "${graphic_driver}"
148     else
149     decho "no graphic_driver found"
150     fi
151   else   else
152   decho "no graphic_driver found"   # default to runtime autodetection
153     graphic_driver="auto"
154     import_resource cfg_graphic "${serial}" module "${graphic_driver}"
155   fi   fi
156  }  }
157    
# Line 154  push_firstboot_10_graphic_resolution() Line 161  push_firstboot_10_graphic_resolution()
161   local monitor_info   local monitor_info
162   local monitor_resolution   local monitor_resolution
163    
164   nsslsay_queue_init   if [[ ${MCORE_GRAPHIC_HWDETECT_DEEP} = 1 ]]
  nsslsay_queue_add "nocolors"  
  nsslsay_queue_add "get hardware.detect info monitor"  
  monitor_info=$(control_client "${serial}" run-queue)  
  monitor_resolution="${monitor_info##*;}"  
  if [[ -n ${monitor_resolution} ]]  
165   then   then
166   decho "monitor_resolution='${monitor_resolution}'"   nsslsay_queue_init
167   import_resource cfg_graphic "${serial}" resolution "${monitor_resolution}"   nsslsay_queue_add "nocolors"
168     nsslsay_queue_add "get hardware.detect info monitor"
169     monitor_info=$(control_client "${serial}" run-queue)
170     monitor_resolution="${monitor_info##*;}"
171     if [[ -n ${monitor_resolution} ]]
172     then
173     decho "monitor_resolution='${monitor_resolution}'"
174     import_resource cfg_graphic "${serial}" resolution "${monitor_resolution}"
175     else
176     decho "no monitor_resolution found"
177     fi
178   else   else
179   decho "no monitor_resolution found"   monitor_resolution="auto"
180     import_resource cfg_graphic "${serial}" resolution "${monitor_resolution}"
181   fi   fi
182  }  }

Legend:
Removed from v.2814  
changed lines
  Added in v.2815