--- alx-src/trunk/alxconfig-ng/functions/config_x11.sh	2005/03/08 20:29:46	218
+++ alx-src/trunk/alxconfig-ng/functions/config_x11.sh	2005/03/08 23:03:18	223
@@ -1,19 +1,13 @@
+# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/functions/config_x11.sh,v 1.4 2005-03-08 23:03:18 niro Exp $
 # configures the x11 server on the host via mysql db settings
 
-#delme settings
-SQL_USER=alx_install
-SQL_PASS=@lx
-SQL_HOST=128.20.41.110
-SQL_DB=alx_web
-ALX_SERIAL=10
-
 get_x11_settings()
 {
 	local x i all DB_X11SETTINGS
 	
 	# autodetect or not ?
 	if [ $(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"select monitorid from cfg_graphic where serial='${ALX_SERIAL}") -gt 0 ]
+		"select monitorid from cfg_graphic where serial='${ALX_SERIAL}'") -gt 0 ]
 	then
 		# settings from db
 
@@ -82,7 +76,7 @@
 	export ALX_MOUSE
 }
 
-write_x11_config() {
+config_x11() {
 
 	# get our settings from the db
 	get_x11_settings
@@ -246,7 +240,7 @@
 		Auto) device=/dev/mouse;;
 		*) device=/dev/mouse;;
 	esac
-
+	echo "    Option \"Device\"      \"${device}\"" >> ${xfconfig}
 	echo '    Option "Resolution"	"1200"' >> ${xfconfig}
 
 	[ "${ALX_MOUSE}" = "IMPS/2" ] && echo '    Option "ZAxisMapping" "4 5"' >> ${xfconfig}