--- alx-src/branches/alxconf_20060908/init.d/alxsettings	2010/12/06 09:18:06	1616
+++ alx-src/branches/alxconf-060/init.d/alxsettings	2011/05/09 15:48:19	2011
@@ -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.27 2005-10-11 12:10:15 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,7 +19,7 @@
 # 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
@@ -39,9 +37,6 @@
 source /usr/lib/alxconfig-ng/functions/config_ssh_auth
 source /usr/lib/alxconfig-ng/functions/config_versions
 
-# check if mysql is available
-[ -x /usr/bin/mysql ] && MYSQL_ALX=true
-
 # other needed vars
 ALX_HW_DETECT=false
 ALX_FORCED_RECHECK=false
@@ -126,8 +121,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 ..."
@@ -154,11 +149,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
@@ -280,14 +277,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}
@@ -453,14 +450,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}
@@ -550,13 +547,13 @@
 	[ -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}
@@ -566,9 +563,11 @@
 		#[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
 		#echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules
 
-		# set an device alias for modprobe.conf
+		# set an device alias for modprobe.conf and modules.conf
 		[ ! -d /etc/modules.d ] && install -d /etc/modules.d
+		[ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
 		echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0
+		echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0
 
 		# regenerate modprobe.conf
 		[ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"
@@ -578,6 +577,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
 
@@ -665,6 +667,7 @@
 preliminary_network()
 {
 	local module
+	local modulesconf
 
 	if [ -f /etc/alxconfig-ng/state/configured ]
 	then
@@ -675,13 +678,25 @@
 			module=$(cat ${SETTINGSPATH}/modules)
 			modprobe ${module}
 		fi
+
+		# check modprobe.conf
+		if [[ $(kernel_major_version) = 2.4 ]]
+		then
+			modulesconf="/etc/modules.conf"
+		else
+			modulesconf="/etc/modprobe.conf"
+		fi
+		if [[ -z $(grep eth0 ${modulesconf}) ]]
+		then
+			modules-update force
+		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
 
@@ -690,13 +705,11 @@
 			# 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 ps -A|grep udhcpc > /dev/null
 			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
@@ -710,7 +723,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
 			;;