--- alx-src/trunk/alxconfig-ng/init.d/alxsettings	2005/04/13 16:15:28	248
+++ alx-src/trunk/alxconfig-ng/init.d/alxsettings	2005/04/14 19:12:21	252
@@ -11,7 +11,7 @@
 #%before:
 #%after:
 
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.8 2005-04-13 16:15:28 niro Exp $
+# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.9 2005-04-14 19:12:21 niro Exp $
 
 # checks first if the client was already configured and if it has an valid serial
 # if not it runs the autoconfiguration script
@@ -33,6 +33,7 @@
 source /usr/lib/alxconfig-ng/functions/config_sessions
 source /usr/lib/alxconfig-ng/functions/config_x11
 source /usr/lib/alxconfig-ng/functions/config_auth
+source /usr/lib/alxconfig-ng/functions/config_ssh_auth
 
 #check if mysql is available
 [ -x /usr/bin/mysql ] && MYSQL_ALX=true
@@ -65,6 +66,9 @@
 
 	# imports auth settings from db
 	config_auth
+
+	# exchange ssh rsa keys
+	config_ssh_auth
 }
 
 get_system_serial(){
@@ -245,11 +249,40 @@
 			'1024x768',
 			'16',
 			'0'
-		);";
+		);"; )
+	evaluate_retval
 
 	# input
-	  mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
-			"insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');";)
+	echo -e "      Input settings ..."
+	mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+			"insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"
+	evaluate_retval
+
+	# auth
+	echo -e "      Authentifcation settings ..."
+	mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+		"insert into client_auth(
+			serial,
+			username,
+			shell,
+			vnc,
+			samba,
+			station
+		)
+		values(
+			'${ALX_SERIAL}',
+			'${ALX_UNPRIV_USER}',
+			'',
+			'',
+			'',
+			''
+		);"
+	evaluate_retval
+
+	# input
+	echo -e "      Autostart settings ..."
+	mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
+			"insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');"
 	evaluate_retval
 }
 
@@ -280,6 +313,11 @@
 
 	#set system state to 'already configured'
 	touch /etc/alxconfig-ng/state/configured
+
+	# default passwords are bad
+	#usermod -p $(perl -e "printf(crypt('foobar','AD'))") root
+	#usermod -p $(perl -e "printf(crypt('foobar','AD'))") ${ALX_UNPRIV_USER}
+	#smbpasswd -a root foobar
 }
 
 #start|stop
@@ -352,8 +390,13 @@
 		then
 			import_settings_to_db
 			import_settings_local
+
+			# here we should also exchange the ssh keys
+			# or the system cannot be rebooted after
+			# the first start via the alx-webadmin
+			config_ssh_auth
 		fi
-		
+
 		#now setup system configuration
 		#alx_setup_or_whatever_it_will_be_called()
 		[ "${ALX_HW_DETECT}" == "false" ] && update_system_settings
@@ -372,3 +415,4 @@
 		echo "Usage: $0 {start|stop} ..."
 		;;
 esac
+