/[alx-svn]/alx-src/tags/alxconf-0_6_0-rc7/init.d/alxsettings

Diff of /alx-src/tags/alxconf-0_6_0-rc7/init.d/alxsettings

Parent Directory | Revision Log | View Patch Patch

-revision 2010 by niro,
Mon May  9 15:44:33 2011 UTC
+revision 2156 by niro,
Tue May 17 21:41:48 2011 UTC
 Line 26 
 source $rc_functions
  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
-Line 66 
 read_cmdline()
+Line 67 
 read_cmdline()
  update_system_settings()
  {
- 	echo -e ${COLMAGENTA}"Checking system setup ..."${COLDEFAULT}
+ 	rc_mecho Checking system setup ...
  	# get the modules settings
  	# ! is the first thing that must be configured !
-Line 125 
 get_system_serial()
+Line 126 
 get_system_serial()
  		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
-Line 148 
 get_system_serial()
+Line 149 
 get_system_serial()
  		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
-Line 177 
 get_system_serial()
+Line 178 
 get_system_serial()
  			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)
-Line 187 
 get_system_serial()
+Line 189 
 get_system_serial()
  			# 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
-Line 215 
 get_system_serial()
+Line 217 
 get_system_serial()
  			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}');
-Line 287 
 import_settings_to_db()
+Line 289 
 import_settings_to_db()
  	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} ] !"
+ 			rc_echo "WARNING: only importing settings for interface [ ${iface} ] !"
- 			source ${network_settings}/net.${iface} || exit 1
+ 			source ${network_settings}/net.${iface} || echo "Error: could not read '${network_settings}/net.${iface}'"
- 			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,
-Line 371 
 import_settings_to_db()
+Line 372 
 import_settings_to_db()
  	evaluate_retval
  	# xserver
- 	echo -e "      Graphic settings ..."
+ 	rc_mecho "      Graphic settings ..."
  	# xserver general
  	( mysqldo "insert into cfg_graphic(
  			serial,
-Line 390 
 import_settings_to_db()
+Line 391 
 import_settings_to_db()
  	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,
-Line 416 
 import_settings_to_db()
+Line 417 
 import_settings_to_db()
  	# 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)"
-Line 460 
 update_settings_in_db()
+Line 462 
 update_settings_in_db()
  	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
-Line 471 
 update_settings_in_db()
+Line 473 
 update_settings_in_db()
  		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/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}',
-Line 512 
 update_settings_in_db()
+Line 514 
 update_settings_in_db()
  	evaluate_retval
  	# xserver
- 	echo -e "      Graphic settings ..."
+ 	rc_mecho "      Graphic settings ..."
  	# xserver general
  	mysqldo "update cfg_graphic set
  			module='${XMODULE}',
-Line 523 
 update_settings_in_db()
+Line 525 
 update_settings_in_db()
  	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)"
-Line 556 
 import_settings_local()
+Line 559 
 import_settings_local()
  	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
- 		#[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
+ 		# set an device alias for modprobe.conf
- 		#echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules
- 		# 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.conf
- 		echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0
  		# 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
-Line 590 
 import_settings_local()
+Line 588 
 import_settings_local()
  	# now generate fluxbox config files
  	# fluxbox main config
- 	cat ${ALX_SKELETONS}/fluxbox/init \
+ 	cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
- 		> ${ALX_UNPRIV_HOME}/.fluxbox/init
  	# fluxbox autostart
- 	cat ${ALX_SKELETONS}/fluxbox/apps \
+ 	cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
- 		> ${ALX_UNPRIV_HOME}/.fluxbox/apps
  	# fluxbox menu header
- 	cat ${ALX_SKELETONS}/fluxbox/menu.header \
+ 	cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu
- 		> ${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" \
+ 	sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
- 		${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 \
+ 	cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
- 		>> ${ALX_UNPRIV_HOME}/.fluxbox/menu
  	# add a newline (maybe there is no crlf in the footer)
  	echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
-Line 667 
 import_settings_local()
+Line 660 
 import_settings_local()
  preliminary_network()
  {
  	local module
- 	local modulesconf
  	if [ -f /etc/alxconfig-ng/state/configured ]
  	then
-Line 679 
 preliminary_network()
+Line 671 
 preliminary_network()
  			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 hwsetup
  		local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
-Line 705 
 preliminary_network()
+Line 686 
 preliminary_network()
  			# keeping like always safe:
  			# no network should be startet here,
  			# so we can delete all pid files if one exists
- 			if ps -A|grep udhcpc > /dev/null
+ 			if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
  			then
- 				echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}
+ 				rc_mecho "Forcing network down"
- 				killall udhcpc
+ 				killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
  				sleep 1
  			fi
- 			[[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \
+ 			[[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop
- 				${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
+ 				${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null
- 				dhcpcd -t 10 &> /dev/null
  				evaluate_retval
  			fi
  			;;
  		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
+ 				ifconfig ${ALX_IFACE} down
  			fi
- 			if ps -A|grep dhcpcd > /dev/null
+ 			if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
  			then
- 				dhcpcd -z  &> /dev/null
+ 				killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
  				sleep 1
  			fi
  			evaluate_retval
-Line 755 
 reset_system_settings()
+Line 734 
 reset_system_settings()
  {
  	# force load of de kbdkeys
  	loadkeys -q de
- 	echo
+ 	rc_echo
- 	echo -en ${COLRED}
+ 	rc_echo -en ${COLRED}
- 	echo -n "*** Warning: you are about to reset *all* local settings on this system!"
+ 	rc_echo -n "*** Warning: you are about to reset *all* local settings on this system!"
- 	echo -e ${COLDEFAULT}
+ 	rc_echo -e ${COLDEFAULT}
- 	echo "*** Do you really want to continue ?"
+ 	rc_echo "*** Do you really want to continue ?"
- 	echo -n "*** Enter 'yes' to continue, anything else to abort: "
+ 	rc_echo -n "*** Enter 'yes' to continue, anything else to abort: "
  	read kbinsert
  	if [[ ${kbinsert} = yes ]]
  	then
- 		echo -en ${COLRED}
+ 		rc_echo -en ${COLRED}
- 		echo -n "*** OK, you really want it ... killing all settings: "
+ 		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}/*
-Line 779 
 reset_system_settings()
+Line 758 
 reset_system_settings()
  		rm -rf /etc/alxconfig-ng/state
  		# clear all printers & net-shares
- 		:> /etc/cups/printers.conf
+ 		:> /etc/printcap
- 		:> /etc/samba/smb.conf
- 		# remove inetd, cups & smb from init
+ 		# remove lprng
- 		rc-config del inetd &> /dev/null
+ 		rc-config del lprng &> /dev/null
- 		rc-config del cups &> /dev/null
- 		rc-config del samba &> /dev/null
  		# remove all user settings
  		[ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
-Line 795 
 reset_system_settings()
+Line 771 
 reset_system_settings()
  		# 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
- 		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
-Line 930 
 case $1 in
+Line 906 
 case $1 in
  		[ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
  		sleep 0.1
  		;;
  	*)
  		echo "Usage: $0 {start|stop} ..."
  		;;
  esac

 Legend:



Removed from v.2010
 


changed lines


 
Added in v.2156
 Legend:



Removed from v.2010
 


changed lines


 
Added in v.2156
-Removed from v.2010
+Added in v.2156