--- mcore-src/trunk/mcore-tools/src/modules/basic-video/graphic.control.class.in	2016/02/02 14:11:44	2755
+++ mcore-src/trunk/mcore-tools/src/modules/basic-video/graphic.control.class.in	2017/04/07 09:13:15	2815
@@ -135,16 +135,23 @@
 	local serial="$1"
 	local graphic_driver
 
-	nsslsay_queue_init
-	nsslsay_queue_add "nocolors"
-	nsslsay_queue_add "get hardware.detect driver graphic"
-	graphic_driver=$(control_client "${serial}" run-queue)
-	if [[ -n ${graphic_driver} ]]
+	if [[ ${MCORE_GRAPHIC_HWDETECT_DEEP} = 1 ]]
 	then
-		decho "graphic_driver='${graphic_driver}'"
-		import_resource cfg_graphic "${serial}" module "${graphic_driver}"
+		nsslsay_queue_init
+		nsslsay_queue_add "nocolors"
+		nsslsay_queue_add "get hardware.detect driver graphic"
+		graphic_driver=$(control_client "${serial}" run-queue)
+		if [[ -n ${graphic_driver} ]]
+		then
+			decho "graphic_driver='${graphic_driver}'"
+			import_resource cfg_graphic "${serial}" module "${graphic_driver}"
+		else
+			decho "no graphic_driver found"
+		fi
 	else
-		decho "no graphic_driver found"
+		# default to runtime autodetection
+		graphic_driver="auto"
+		import_resource cfg_graphic "${serial}" module "${graphic_driver}"
 	fi
 }
 
@@ -154,16 +161,22 @@
 	local monitor_info
 	local monitor_resolution
 
-	nsslsay_queue_init
-	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} ]]
+	if [[ ${MCORE_GRAPHIC_HWDETECT_DEEP} = 1 ]]
 	then
-		decho "monitor_resolution='${monitor_resolution}'"
-		import_resource cfg_graphic "${serial}" resolution "${monitor_resolution}"
+		nsslsay_queue_init
+		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} ]]
+		then
+			decho "monitor_resolution='${monitor_resolution}'"
+			import_resource cfg_graphic "${serial}" resolution "${monitor_resolution}"
+		else
+			decho "no monitor_resolution found"
+		fi
 	else
-		decho "no monitor_resolution found"
+		monitor_resolution="auto"
+		import_resource cfg_graphic "${serial}" resolution "${monitor_resolution}"
 	fi
 }