--- alx-src/trunk/alxconfig-ng/init.d/alxsettings	2005/03/09 00:04:23	227
+++ alx-src/trunk/alxconfig-ng/init.d/alxsettings	2005/03/09 00:17:49	230
@@ -11,7 +11,7 @@
 #%before:
 #%after:
 
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.3 2005-03-09 00:04:23 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.5 2005-03-09 00:17:49 niro Exp $
 
 # checks first if the client was already configured and if it has an valid serial
 # if not it runs the autoconfiguration script
@@ -174,7 +174,7 @@
 		HOSTNAME="${ALX_DEFAULT_HOSTNAME}"
 
 		#update the hostname on the system for sure
-		echo "HOSTNAME=${HOSTNAME}" > /etc/hostname
+		echo "${HOSTNAME}" > /etc/hostname
 
 		#start preliminary networking (dhcp)
 		preliminary_network start
@@ -257,23 +257,23 @@
 import_settings_to_db() {
 	#note: networking is always 'dhcp' if hw was autodetected
 	#note: default_domain/hostname is set in config.rc
-	
+
 	#to be safe, we do some sanity checks
 	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
 	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
-	
+
 	#vars used by hwdetect
 	local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
 	local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
 	local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
-	
+
 	#get setting from hwdetect
 	source /etc/sysconfig/hwsetup/knoppix
 	source /etc/sysconfig/hwsetup/mouse
-	
+
 	echo
 	echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
-	
+
 	#network
 	echo -e "      Network settings ..."
 	mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
@@ -292,7 +292,7 @@
 			'dhcp'
 		);"
 	evaluate_retval
-	
+
 	#xserver
 	echo -e "      Graphic settings ..."
 	#xserver general
@@ -301,31 +301,17 @@
 			serial,
 			module,
 			resolution,
-			depth
+			depth,
+			monitorid
 		)
 		values(
 			'${ALX_SERIAL}',
 			'${XMODULE}',
 			'1024x768',
-			'16'
-		);";
-	#xserver monitor
-	  mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-		"insert into cfg_monitor(
-			serial,
-			vendor,
-			model,
-			hsync,
-			vrefresh
-		)
-		values(
-			'${ALX_SERIAL}',
-			'Aamazing',
-			'CM-1528-FS',
-			'28-64',
-			'47-104'
+			'16',
+			'0'
 		);";
-		
+
 	# input
 	  mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
 			"insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');";)