--- alx-src/trunk/alxconfig-ng/init.d/alxsettings	2005/10/09 21:38:14	348
+++ alx-src/branches/alxconf-060/init.d/alxsettings	2011/05/16 11:08:31	2122
@@ -1,8 +1,8 @@
 #!/bin/bash
-
+# $Id$
 # <niro@magellan-linux.de>
 
-#%rlevels: 7:s 0:k 6:k
+#%rlevels: 7:s 0:k
 #%start: 41
 #%stop: 01
 
@@ -11,8 +11,6 @@
 #%before:
 #%after:
 
-# $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.23 2005-10-09 21:38:14 niro Exp $
-
 # checks first if the client was already configured and if it has an valid serial
 # if not it runs the autoconfiguration script
 # these settings will be used for client setup
@@ -21,13 +19,14 @@
 # if no changes are at server side they will be kept, if yes the get updated. 
 # the server settings has higher priority.
 
-source /etc/sysconfig/rc
+source /etc/conf.d/rc
 source $rc_functions
 
 # mysql settings
 source /etc/alxconfig-ng/config.rc
 
 # helper functions
+source /usr/lib/alxconfig-ng/functions/common
 source /usr/lib/alxconfig-ng/functions/mysqlfunctions
 source /usr/lib/alxconfig-ng/functions/serial_functions
 source /usr/lib/alxconfig-ng/functions/config_modules
@@ -37,9 +36,7 @@
 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
+source /usr/lib/alxconfig-ng/functions/config_versions
 
 # other needed vars
 ALX_HW_DETECT=false
@@ -93,11 +90,21 @@
 
 	# exchange ssh rsa keys
 	HOME=/root config_ssh_auth
+
+	# import version info
+	config_version
 }
 
 get_system_serial()
 {
-	local CUR_IP CUR_MAC CUR_MTIME
+	local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE
+
+	if [[ ${ALX_CONFD_NETWORKING} = true ]]
+	then
+		ALX_IFACE="$(< ${SETTINGSPATH}/confd-networking)"
+	else
+		ALX_IFACE="eth0"
+	fi
 
 	# check if serial file exists
 	if [ -f /etc/alxconfig-ng/serial ] && [[ ${ALX_FORCED_RECHECK} = false ]]
@@ -115,8 +122,8 @@
 			exit 1
 		fi
 
-		CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
-		CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
+		CUR_IP=$(ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
+		CUR_MAC=$(ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
 		CUR_MTIME=$(date +%s)
 
 		echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
@@ -132,7 +139,7 @@
 		else
 			# abort on non valid serial
 			ALX_STATE="invalid serial"
-			echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
+			echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
 			show_invalid_serial_msg
 			exit 1
 		fi
@@ -143,11 +150,13 @@
 		if [[ ${ALX_FORCED_RECHECK} = true ]]
 		then
 			echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}
+			# always disable CONFD_NETWORKING here
+			export ALX_CONFD_NETWORKING="false"
 		else
 			echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
 		fi
 		ALX_HW_DETECT=true
-		/etc/init.d/hwdetect start
+		hwsetup
 
 		# set hostname to alx_default_hostname
 		# use old hostname if this is a forced re-check
@@ -169,6 +178,7 @@
 			exit 1
 		fi
 
+
 		CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')
 		CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
 		CUR_MTIME=$(date +%s)
@@ -198,7 +208,7 @@
 			fi
 
 			# write current state to temp file
-			echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
+			echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
 			[ -f /hardware-auto-detection ] && rm /hardware-auto-detection
 
 			# now export ALX_FORCED_RECHECK=true
@@ -223,8 +233,8 @@
 			# set ALX_STATE to ok so everybody knows that everything was ok
 			ALX_STATE=ok
 
-			echo "ALX_SERIAL=${ALX_SERIAL}" > /etc/alxconfig-ng/serial
-			echo "ALX_REG_DATE=${CUR_MTIME}" >> /etc/alxconfig-ng/serial
+			echo "ALX_SERIAL=\"${ALX_SERIAL}\"" > /etc/alxconfig-ng/serial
+			echo "ALX_REG_DATE=\"${CUR_MTIME}\"" >> /etc/alxconfig-ng/serial
 
 			evaluate_retval
 		else
@@ -243,8 +253,8 @@
 	fi
 
 	# write current state to temp file
-	echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
-	echo "ALX_IFACE=${ALX_IFACE}" >> /etc/alxconfig-ng/state/state
+	echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
+	echo "ALX_IFACE=\"${ALX_IFACE}\"" >> /etc/alxconfig-ng/state/state
 }
 
 
@@ -269,14 +279,14 @@
 	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
 	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
 
-	# vars used by hwdetect
+	# vars used by hwsetup
 	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
+	# get setting from hwsetup
+	source /etc/conf.d/hwsetup/knoppix
+	source /etc/conf.d/hwsetup/mouse
 
 	echo
 	echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
@@ -292,7 +302,7 @@
 			[[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
 			echo "WARNING: only importing settings for interface [ ${iface} ] !"
 			source ${network_settings}/net.${iface} || exit 1
-			NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"
+			NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
 
 			mysqldo "insert into cfg_network(
 				hostname,
@@ -370,14 +380,14 @@
 			module,
 			resolution,
 			depth,
-			monitorid
+			refresh_rate
 		)
 		values(
 			'${ALX_SERIAL}',
 			'${XMODULE}',
 			'1024x768',
 			'16',
-			'0'
+			'60'
 		);"; )
 	evaluate_retval
 
@@ -420,6 +430,14 @@
 	echo -e "      Screensaver settings ..."
 	mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"
 
+	# version info
+	local alx_os
+	local alx_utils
+	alx_os="$(< /etc/mageversion)"
+	alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
+	alx_utils="${alx_utils/alxconfig-ng-alx-}"
+	mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"
+
 	evaluate_retval
 }
 
@@ -434,14 +452,14 @@
 	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
 	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
 
-	# vars used by hwdetect
+	# vars used by hwsetup
 	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
+	# get setting from hwsetup
+	source /etc/conf.d/hwsetup/knoppix
+	source /etc/conf.d/hwsetup/mouse
 
 	echo
 	echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}
@@ -457,7 +475,7 @@
 			[[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
 			echo "WARNING: only importing settings for interface [ ${iface} ] !"
 			source ${network_settings}/net.${iface} || exit 1
-			NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"
+			NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
 
 			mysqldo "update cfg_network set
 					hostname='${ALX_DEFAULT_HOSTNAME}',
@@ -502,7 +520,7 @@
 			module='${XMODULE}',
 			resolution='1024x768',
 			depth='16',
-			monitorid='0'
+			refresh_rate='60'
 		where serial=${ALX_SERIAL};"
 	evaluate_retval
 
@@ -510,6 +528,14 @@
 	echo -e "      Input settings ..."
 	mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"
 	evaluate_retval
+
+	# version info
+	local alx_os
+	local alx_utils
+	alx_os="$(< /etc/mageversion)"
+	alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
+	alx_utils="${alx_utils/alxconfig-ng-alx-}"
+	mysqldo "update client_version set os='${alx_os}', utils='${alx_utils}' where serial=${ALX_SERIAL};"
 }
 
 # imports current settings to the local system resolved by the hardware detection
@@ -523,25 +549,22 @@
 	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
 	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
 
-	# vars used by hwdetect
+	# vars used by hwsetup
 	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
+	# get setting from hwsetup
+	source /etc/conf.d/hwsetup/knoppix
 
 	echo
 	echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}
 
 	if [[ ${ALX_CONFD_NETWORKING} = false ]]
 	then
-		#[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
-		#echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules
-
 		# set an device alias for modprobe.conf
-		[ ! -d /etc/modules.d ] && install -d /etc/modules.d
-		echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0
+		[ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
+		echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0.conf
 
 		# regenerate modprobe.conf
 		[ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"
@@ -551,6 +574,9 @@
 	# set system state to 'already configured'
 	touch /etc/alxconfig-ng/state/configured
 
+	# install slim desktopmanager configuration
+	config_display_manager
+
 	# if only an recheck was forced than abort now
 	[[ ${ALX_FORCED_RECHECK} = true ]] && return 0
 
@@ -561,28 +587,23 @@
 	# now generate fluxbox config files
 
 	# fluxbox main config
-	cat ${ALX_SKELETONS}/fluxbox/init \
-		> ${ALX_UNPRIV_HOME}/.fluxbox/init
+	cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
 
 	# fluxbox autostart
-	cat ${ALX_SKELETONS}/fluxbox/apps \
-		> ${ALX_UNPRIV_HOME}/.fluxbox/apps
+	cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
 
 	# fluxbox menu header
-	cat ${ALX_SKELETONS}/fluxbox/menu.header \
-		> ${ALX_UNPRIV_HOME}/.fluxbox/menu
+	cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu
 
 	# now fix it with proper messages :P
 	local ver="$(< /etc/mageversion)"
-	sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \
-		${ALX_UNPRIV_HOME}/.fluxbox/menu
+	sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
 
 	# add a newline (maybe there is no crlf in the header)
 	echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
 
 	# fluxbox menu footer
-	cat ${ALX_SKELETONS}/fluxbox/menu.footer \
-		>> ${ALX_UNPRIV_HOME}/.fluxbox/menu
+	cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
 
 	# add a newline (maybe there is no crlf in the footer)
 	echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
@@ -622,12 +643,16 @@
 		--icon-width "1" \
 		--icon-height "1"
 
+	# create a xinitrc
+	echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc
+
 	# set correct permissions
 	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
 	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
 	chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
 	chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
 	chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc
+	chmod 0644 ${ALX_UNPRIV_HOME}/.xinitrc
 }
 
 # start|stop
@@ -644,13 +669,14 @@
 			module=$(cat ${SETTINGSPATH}/modules)
 			modprobe ${module}
 		fi
+
 	else
-		# vars used by hwdetect
+		# vars used by hwsetup
 		local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
 		local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
 
-		# get setting from hwdetect
-		source /etc/sysconfig/hwsetup/knoppix
+		# get setting from hwsetup
+		source /etc/conf.d/hwsetup/knoppix
 		modprobe ${NETCARD_DRIVER}
 	fi
 
@@ -659,16 +685,13 @@
 			# keeping like always safe:
 			# no network should be startet here,
 			# so we can delete all pid files if one exists
-			if ps -A|grep dhcpcd > /dev/null
+			if [[ ! -z $(pidof udhcpc) ]]
 			then
 				echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}
-				dhcpcd -k
+				killall udhcpc &> /dev/null
 				sleep 1
-			else
-				rm -f /var/run/dhcpcd-eth?.pid
 			fi
-			[[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \
-				${rc_base}/init.d/network stop
+			[[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop
 
 			echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}
 
@@ -679,7 +702,7 @@
 			else
 				echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}
 				# -t 10 timeout of 10 secs
-				dhcpcd -t 10 &> /dev/null
+				udhcpc -t 10 &> /dev/null
 				evaluate_retval
 			fi
 			;;
@@ -693,9 +716,10 @@
 				echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}
 				ifconfig eth0 down
 			fi
-			if ps -A|grep dhcpcd > /dev/null
+			if [[ ! -z $(pidof udhcpc) ]]
 			then
-				dhcpcd -z  &> /dev/null
+				killall udhcpc  &> /dev/null
+				sleep 1
 			fi
 			evaluate_retval
 			;;
@@ -733,6 +757,25 @@
 		rm -f /etc/alxconfig-ng/serial
 		rm -rf /etc/alxconfig-ng/state
 
+		# clear all printers & net-shares
+		:> /etc/printcap
+
+		# remove lprng
+		rc-config del lprng &> /dev/null
+
+		# remove all user settings
+		[ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
+
+		# remove all ica-sessions
+		find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs rm
+
+		# remove all old nics and modules configs
+		find /etc/conf.d -type f -name 'net.*' | xargs rm
+		find /etc/modprobe.d -type f -name 'net.*' | xargs rm
+
+		# restore default networking
+		cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0
+
 		echo "I am done now, press [Enter] to reboot system ..."
 	else
 		echo "Aborted, press [Enter] to reboot system ..."
@@ -863,6 +906,7 @@
 		[ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
 		sleep 0.1
 		;;
+
 	*)
 		echo "Usage: $0 {start|stop} ..."
 		;;