--- alx-src/branches/alxconf-060/init.d/alxsettings	2011/05/16 11:08:31	2122
+++ alx-src/branches/alxconf-060/init.d/alxsettings	2011/05/17 10:51:57	2141
@@ -126,7 +126,7 @@
 		CUR_MAC=$(ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
 		CUR_MTIME=$(date +%s)
 
-		echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
+		rc_print "Trying to validate my serial ..."
 
 		# nice serial output
 		$CURS_UP
@@ -149,11 +149,11 @@
 		echo
 		if [[ ${ALX_FORCED_RECHECK} = true ]]
 		then
-			echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}
+			rc_mecho "Hardware autodetection forced by system-administrator"
 			# always disable CONFD_NETWORKING here
 			export ALX_CONFD_NETWORKING="false"
 		else
-			echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
+			rc_mecho "Preparing system for first boot"
 		fi
 		ALX_HW_DETECT=true
 		hwsetup
@@ -189,7 +189,7 @@
 			# but first check the serial
 			source /etc/alxconfig-ng/serial
 
-			echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
+			rc_print "Trying to validate my serial ..."
 
 			# nice serial output
 			$CURS_UP
@@ -217,7 +217,7 @@
 			return 0
 		fi
 
-		echo -e ${COLOREDSTAR} "Trying to get new serial ..."
+		rc_print "Trying to get new serial ..."
 
 		# request a new serial; one command now (cause must be done in the same session)
 		ALX_SERIAL=$(mysqldo "insert into client_serials (mtime, mac) values('${CUR_MTIME}','${CUR_MAC}');
@@ -289,19 +289,18 @@
 	source /etc/conf.d/hwsetup/mouse
 
 	echo
-	echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
+	rc_mecho "Importing detected settings to database"
 
 	# network
-	echo -e "      Network settings ..."
+	rc_mecho "      Network settings ..."
 	if [[ ${ALX_CONFD_NETWORKING} = true ]]
 	then
 		# get settings
-		#source ${rc_base}/init.d/network &> /dev/null
 		for iface in $(onboot_interface_list ${network_settings}/net.*)
 		do
 			[[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
-			echo "WARNING: only importing settings for interface [ ${iface} ] !"
-			source ${network_settings}/net.${iface} || exit 1
+			rc_echo "WARNING: only importing settings for interface [ ${iface} ] !"
+			source ${network_settings}/net.${iface} || echo "Error: could not read '${network_settings}/net.${iface}'"
 			NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
 
 			mysqldo "insert into cfg_network(
@@ -373,7 +372,7 @@
 	evaluate_retval
 
 	# xserver
-	echo -e "      Graphic settings ..."
+	rc_mecho "      Graphic settings ..."
 	# xserver general
 	( mysqldo "insert into cfg_graphic(
 			serial,
@@ -392,12 +391,12 @@
 	evaluate_retval
 
 	# input
-	echo -e "      Input settings ..."
+	rc_mecho "      Input settings ..."
 	mysqldo "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"
 	evaluate_retval
 
 	# auth
-	echo -e "      Authentification settings ..."
+	rc_mecho "      Authentification settings ..."
 	mysqldo "insert into client_auth(
 			serial,
 			username,
@@ -418,19 +417,20 @@
 
 	# exchange ssh rsa keys - the first boot needs this !
 	# or no reboot will work via the webadmin
-	echo -e "      SSH authentification settings ..."
+	rc_mecho "      SSH authentification settings ..."
 	HOME=/root config_ssh_auth
 	evaluate_retval
 
 	# autostart
-	echo -e "      Autostart settings ..."
+	rc_mecho "      Autostart settings ..."
 	mysqldo "insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');"
 
 	# screensaver
-	echo -e "      Screensaver settings ..."
+	rc_mecho "      Screensaver settings ..."
 	mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"
 
 	# version info
+	rc_mecho "      OS version info ..."
 	local alx_os
 	local alx_utils
 	alx_os="$(< /etc/mageversion)"
@@ -462,10 +462,10 @@
 	source /etc/conf.d/hwsetup/mouse
 
 	echo
-	echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}
+	rc_mecho "Updating detected settings in database"
 
 	# network
-	echo -e "      Network settings ..."
+	rc_mecho "      Network settings ..."
 	if [[ ${ALX_CONFD_NETWORKING} = true ]]
 	then
 		# get settings
@@ -473,7 +473,7 @@
 		for iface in $(onboot_interface_list ${network_settings}/net.*)
 		do
 			[[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
-			echo "WARNING: only importing settings for interface [ ${iface} ] !"
+			rc_echo "WARNING: only importing settings for interface [ ${iface} ] !"
 			source ${network_settings}/net.${iface} || exit 1
 			NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
 
@@ -514,7 +514,7 @@
 	evaluate_retval
 
 	# xserver
-	echo -e "      Graphic settings ..."
+	rc_mecho "      Graphic settings ..."
 	# xserver general
 	mysqldo "update cfg_graphic set
 			module='${XMODULE}',
@@ -525,11 +525,12 @@
 	evaluate_retval
 
 	# input
-	echo -e "      Input settings ..."
+	rc_mecho "      Input settings ..."
 	mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"
 	evaluate_retval
 
 	# version info
+	rc_mecho "      OS version info ..."
 	local alx_os
 	local alx_utils
 	alx_os="$(< /etc/mageversion)"
@@ -558,7 +559,7 @@
 	source /etc/conf.d/hwsetup/knoppix
 
 	echo
-	echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}
+	rc_mecho "Importing detected settings to local system"
 
 	if [[ ${ALX_CONFD_NETWORKING} = false ]]
 	then
@@ -567,7 +568,7 @@
 		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"
+		[ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!"
 		evaluate_retval
 	fi
 
@@ -687,20 +688,20 @@
 			# so we can delete all pid files if one exists
 			if [[ ! -z $(pidof udhcpc) ]]
 			then
-				echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}
+				rc_mecho "Forcing network down"
 				killall udhcpc &> /dev/null
 				sleep 1
 			fi
 			[[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop
 
-			echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}
+			rc_mecho "Starting preliminary networking ... "
 
 			# start network configured from /etc/conf.d
 			if [[ ${ALX_CONFD_NETWORKING} = true ]]
 			then
 				${rc_base}/init.d/network start
 			else
-				echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}
+				rc_print "Starting default dhcp based networking ... "
 				# -t 10 timeout of 10 secs
 				udhcpc -t 10 &> /dev/null
 				evaluate_retval
@@ -708,12 +709,12 @@
 			;;
 
 		stop)
-			echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT}
+			rc_mecho "Stopping preliminary networking ... "
 			if [[ ${ALX_CONFD_NETWORKING} = true ]]
 			then
 				${rc_base}/init.d/network stop
 			else
-				echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}
+				rc_print "Stopping default dhcp based networking ... "
 				ifconfig eth0 down
 			fi
 			if [[ ! -z $(pidof udhcpc) ]]
@@ -734,23 +735,23 @@
 {
 	# force load of de kbdkeys
 	loadkeys -q de
-	echo
-	echo -en ${COLRED}
-	echo -n "*** Warning: you are about to reset *all* local settings on this system!"
-	echo -e ${COLDEFAULT}
-	echo "*** Do you really want to continue ?"
-	echo -n "*** Enter 'yes' to continue, anything else to abort: "
+	rc_echo
+	rc_echo -en ${COLRED}
+	rc_echo -n "*** Warning: you are about to reset *all* local settings on this system!"
+	rc_echo -e ${COLDEFAULT}
+	rc_echo "*** Do you really want to continue ?"
+	rc_echo -n "*** Enter 'yes' to continue, anything else to abort: "
 	read kbinsert
 	if [[ ${kbinsert} = yes ]]
 	then
-		echo -en ${COLRED}
-		echo -n "*** OK, you really want it ... killing all settings: "
+		rc_echo -en ${COLRED}
+		rc_echo -n "*** OK, you really want it ... killing all settings: "
 		for i in 3 2 1 now
 		do
-			echo -n " ${i}"
+			rc_echo -n " ${i}"
 			sleep 1
 		done
-		echo -e ${COLDEFAULT}
+		rc_echo -e ${COLDEFAULT}
 
 		## reset all settings:
 		rm -rf ${SETTINGSPATH}/*
@@ -776,9 +777,9 @@
 		# restore default networking
 		cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0
 
-		echo "I am done now, press [Enter] to reboot system ..."
+		rc_echo "I am done now, press [Enter] to reboot system ..."
 	else
-		echo "Aborted, press [Enter] to reboot system ..."
+		rc_echo "Aborted, press [Enter] to reboot system ..."
 	fi
 	read
 	reboot
@@ -911,4 +912,3 @@
 		echo "Usage: $0 {start|stop} ..."
 		;;
 esac
-