--- alx-src/branches/alxconf_20060908/init.d/alxsettings	2011/01/25 10:44:10	1718
+++ alx-src/branches/alxconf-060/init.d/alxsettings	2011/05/11 09:19:45	2039
@@ -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,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
@@ -39,9 +38,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 +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 ..."
@@ -160,7 +156,7 @@
 			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
@@ -182,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)
@@ -282,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}
@@ -455,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}
@@ -552,27 +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 and modules.conf
-		[ ! -d /etc/modules.d ] && install -d /etc/modules.d
+		# set an device alias for modprobe.conf
 		[ ! -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
+		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"
@@ -595,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
@@ -682,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
 
@@ -697,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}
 
@@ -717,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
 			;;
@@ -731,9 +716,9 @@
 				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
@@ -924,6 +909,7 @@
 		[ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
 		sleep 0.1
 		;;
+
 	*)
 		echo "Usage: $0 {start|stop} ..."
 		;;