--- alx-src/branches/alxconf-060/init.d/alxsettings	2011/05/09 15:35:49	2008
+++ alx-src/branches/alxconf-060/init.d/alxsettings	2011/05/16 11:08:31	2122
@@ -26,6 +26,7 @@
 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
@@ -155,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
@@ -177,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)
@@ -277,12 +279,12 @@
 	[ -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
+	# get setting from hwsetup
 	source /etc/conf.d/hwsetup/knoppix
 	source /etc/conf.d/hwsetup/mouse
 
@@ -300,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,
@@ -450,12 +452,12 @@
 	[ -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
+	# get setting from hwsetup
 	source /etc/conf.d/hwsetup/knoppix
 	source /etc/conf.d/hwsetup/mouse
 
@@ -473,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}',
@@ -547,12 +549,12 @@
 	[ -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
+	# get setting from hwsetup
 	source /etc/conf.d/hwsetup/knoppix
 
 	echo
@@ -560,14 +562,9 @@
 
 	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"
@@ -590,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
@@ -667,7 +659,6 @@
 preliminary_network()
 {
 	local module
-	local modulesconf
 
 	if [ -f /etc/alxconfig-ng/state/configured ]
 	then
@@ -679,23 +670,12 @@
 			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
+		# get setting from hwsetup
 		source /etc/conf.d/hwsetup/knoppix
 		modprobe ${NETCARD_DRIVER}
 	fi
@@ -705,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}
 
@@ -725,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
 			;;
@@ -739,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
@@ -781,13 +758,10 @@
 		rm -rf /etc/alxconfig-ng/state
 
 		# clear all printers & net-shares
-		:> /etc/cups/printers.conf
-		:> /etc/samba/smb.conf
+		:> /etc/printcap
 
-		# remove inetd, cups & smb from init
-		rc-config del inetd &> /dev/null
-		rc-config del cups &> /dev/null
-		rc-config del samba &> /dev/null
+		# remove lprng
+		rc-config del lprng &> /dev/null
 
 		# remove all user settings
 		[ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
@@ -797,7 +771,7 @@
 
 		# remove all old nics and modules configs
 		find /etc/conf.d -type f -name 'net.*' | xargs rm
-		find /etc/modules.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
@@ -932,6 +906,7 @@
 		[ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
 		sleep 0.1
 		;;
+
 	*)
 		echo "Usage: $0 {start|stop} ..."
 		;;