/[alx-svn]/alx-src/branches/alxconf-060/init.d/alxsettings

Diff of /alx-src/branches/alxconf-060/init.d/alxsettings

Parent Directory | Revision Log | View Patch Patch

-revision 2008 by niro,
Mon May  9 15:35:49 2011 UTC
+revision 3476 by niro,
Fri Apr 13 18:11:28 2012 UTC
 Line 26 
 source $rc_functions
  source /etc/alxconfig-ng/config.rc
  # helper functions
- source /usr/lib/alxconfig-ng/functions/mysqlfunctions
+ source ${ALX_FUNCTIONS}/common
- source /usr/lib/alxconfig-ng/functions/serial_functions
+ source ${ALX_FUNCTIONS}/mysqlfunctions
- source /usr/lib/alxconfig-ng/functions/config_modules
+ source ${ALX_FUNCTIONS}/serial_functions
- source /usr/lib/alxconfig-ng/functions/config_network
+ source ${ALX_FUNCTIONS}/config_modules
- source /usr/lib/alxconfig-ng/functions/config_printers
+ source ${ALX_FUNCTIONS}/config_plugins
- source /usr/lib/alxconfig-ng/functions/config_sessions
+ source ${ALX_FUNCTIONS}/config_network
- source /usr/lib/alxconfig-ng/functions/config_x11
+ source ${ALX_FUNCTIONS}/config_printers
- source /usr/lib/alxconfig-ng/functions/config_auth
+ source ${ALX_FUNCTIONS}/config_sessions
- source /usr/lib/alxconfig-ng/functions/config_ssh_auth
+ source ${ALX_FUNCTIONS}/config_x11
- source /usr/lib/alxconfig-ng/functions/config_versions
+ source ${ALX_FUNCTIONS}/config_auth
+ source ${ALX_FUNCTIONS}/config_ssh_auth
+ source ${ALX_FUNCTIONS}/config_versions
  # other needed vars
  ALX_HW_DETECT=false
-Line 50 
 unset ALX_SERIAL ALX_STATE
+Line 52 
 unset ALX_SERIAL ALX_STATE
  # setup needed directories
  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state
- # read_cmdline ${item}
- read_cmdline()
- {
- 	local i
- 	for i in $(< /proc/cmdline)
- 	do
- 		[[ ${i} = $1 ]] && return 0
- 	done
- 	return 1
- }
  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 !
  	config_modules
+ 	# install or uninstall plugins
+ 	config_plugins
  	# imports network settings from db
  	config_networking
-Line 96 
 update_system_settings()
+Line 87 
 update_system_settings()
  get_system_serial()
  {
- 	local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE
+ 	# never declare ALX_IFACE as a local variable! ->fixme!
+ 	local CUR_IP CUR_MAC CUR_MTIME CONFIG
  	if [[ ${ALX_CONFD_NETWORKING} = true ]]
  	then
-Line 125 
 get_system_serial()
+Line 117 
 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
  		$SET_WCOL
- 		echo "[ SN: ${ALX_SERIAL} ]"
+ 		rc_echo "[ SN: ${ALX_SERIAL} ]"
  		if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"
  		then
-Line 138 
 get_system_serial()
+Line 130 
 get_system_serial()
  		else
  			# abort on non valid serial
  			ALX_STATE="invalid serial"
- 			echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
+ 			CONFIG="/etc/alxconfig-ng/state/state"
+ 			clearconfig
+ 			addconfig "ALX_STATE=\"${ALX_STATE}\""
  			show_invalid_serial_msg
  			exit 1
  		fi
  	else
  		# run hardware detection
- 		echo
+ 		rc_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
- 		/etc/init.d/hwdetect start
+ 		hwsetup
  		# set hostname to alx_default_hostname
  		# use old hostname if this is a forced re-check
-Line 164 
 get_system_serial()
+Line 158 
 get_system_serial()
  		HOSTNAME="${ALX_DEFAULT_HOSTNAME}"
  		# update the hostname on the system for sure
- 		echo "${HOSTNAME}" > /etc/hostname
+ 		CONFIG="/etc/hostname"
+ 		clearconfig
+ 		addconfig "${HOSTNAME}"
  		# start preliminary networking (dhcp)
  		preliminary_network start
-Line 177 
 get_system_serial()
+Line 173 
 get_system_serial()
  			exit 1
  		fi
- 		CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')
+ 		CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
- 		CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
+ 		CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
  		CUR_MTIME=$(date +%s)
  		# abort now if this is a forced re-check
-Line 187 
 get_system_serial()
+Line 183 
 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
  			$SET_WCOL
- 			echo "[ SN: ${ALX_SERIAL} ]"
+ 			rc_echo "[ SN: ${ALX_SERIAL} ]"
  			if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"
  			then
-Line 200 
 get_system_serial()
+Line 196 
 get_system_serial()
  			else
  				# abort on non valid serial
  				ALX_STATE="invalid serial"
- 				echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
+ 				CONFIG="/etc/alxconfig-ng/state/state"
+ 				clearconfig
+ 				addconfig "ALX_STATE=\"${ALX_STATE}\""
  				show_invalid_serial_msg
  				exit 1
  			fi
  			# write current state to temp file
- 			echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
+ 			CONFIG="/etc/alxconfig-ng/state/state"
+ 			clearconfig
+ 			addconfig "ALX_STATE=\"${ALX_STATE}\""
  			[ -f /hardware-auto-detection ] && rm /hardware-auto-detection
  			# now export ALX_FORCED_RECHECK=true
 Line 215 
 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 226 
 get_system_serial()
  			# nice serial output
  			$CURS_UP
  			$SET_WCOL
- 			echo "[ SN: ${ALX_SERIAL} ]"
+ 			rc_echo "[ SN: ${ALX_SERIAL} ]"
  			# set ALX_STATE to ok so everybody knows that everything was ok
  			ALX_STATE=ok
- 			echo "ALX_SERIAL=\"${ALX_SERIAL}\"" > /etc/alxconfig-ng/serial
+ 			CONFIG="/etc/alxconfig-ng/serial"
- 			echo "ALX_REG_DATE=\"${CUR_MTIME}\"" >> /etc/alxconfig-ng/serial
+ 			clearconfig
+ 			addconfig "ALX_SERIAL=\"${ALX_SERIAL}\""
+ 			addconfig "ALX_REG_DATE=\"${CUR_MTIME}\""
  			evaluate_retval
  		else
-Line 246 
 get_system_serial()
+Line 248 
 get_system_serial()
  			# nice serial output
  			$CURS_UP
  			$SET_WCOL
- 			echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"
+ 			rc_echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"
  		fi
  	fi
  	# write current state to temp file
- 	echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
+ 	CONFIG="/etc/alxconfig-ng/state/state"
- 	echo "ALX_IFACE=\"${ALX_IFACE}\"" >> /etc/alxconfig-ng/state/state
+ 	clearconfig
+ 	addconfig "ALX_STATE=\"${ALX_STATE}\""
+ 	addconfig "ALX_IFACE=\"${ALX_IFACE}\""
  }
-Line 277 
 import_settings_to_db()
+Line 281 
 import_settings_to_db()
  	[ -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
- 	echo
+ 	rc_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 374 
 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 393 
 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 419 
 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)"
- 	alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
+ 	alx_utils="$(magequery -n alxconfig-ng | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
- 	alx_utils="${alx_utils/alxconfig-ng-alx-}"
+ 	alx_utils="${alx_utils/alxconfig-ng-}"
  	mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"
  	evaluate_retval
-Line 450 
 update_settings_in_db()
+Line 454 
 update_settings_in_db()
  	[ -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
- 	echo
+ 	rc_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 475 
 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 516 
 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 527 
 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 547 
 import_settings_local()
+Line 552 
 import_settings_local()
  	[ -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
+ 	rc_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
+ 		# update only if not the same (to speed up bootprocess - no depmod)
- 		echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0
+ 		CONFIG="/etc/modprobe.d/net.${ALX_IFACE}.conf"
+ 		clearconfig
+ 		addconfig "alias ${ALX_IFACE} ${cfg_network_module}"
+ 		# update confd-networking default iface
+ 		[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
+ 		CONFIG="${SETTINGSPATH}/confd-networking"
+ 		clearconfig
+ 		addconfig "${ALX_IFACE}"
  		# 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 599 
 import_settings_local()
  	# now generate fluxbox config files
  	# fluxbox main config
- 	cat ${ALX_SKELETONS}/fluxbox/init \
+ 	local fbinit
- 		> ${ALX_UNPRIV_HOME}/.fluxbox/init
+ 	if [ -f ${ALX_SKELETONS}/fluxbox/init ]
+ 	then
+ 		fbinit="${ALX_SKELETONS}/fluxbox/init"
+ 	else
+ 		fbinit="/usr/share/fluxbox/init"
+ 	fi
+ 	cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
  	# fluxbox autostart
- 	cat ${ALX_SKELETONS}/fluxbox/apps \
+ 	CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
- 		> ${ALX_UNPRIV_HOME}/.fluxbox/apps
+ 	# do not show decorations on messages generated with xmessage
+ 	if [ -x /usr/bin/xmessage ]
+ 	then
+ 		addconfig '[app] (xmessage)'
+ 		addconfig '	[Deco] {NONE}'
+ 		addconfig '[end]'
+ 	fi
+ 	# add icon utility
+ 	[ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
+ 	# add numlock utility
+ 	[ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
+ 	# fluxbox hotkeys
+ 	local fbkeys
+ 	if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
+ 	then
+ 		fbkeys="${ALX_SKELETONS}/fluxbox/keys"
+ 	else
+ 		fbkeys="/usr/share/fluxbox/keys"
+ 	fi
+ 	cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
  	# 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
  	# setup some standart icons (sysinfo.lnk)
- 	# basic config
- 	cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc
  	# clean desktop icon location
- 	[ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop
+ 	[ -d ${ALX_UNPRIV_HOME}/.idesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.idesktop
- 	install -d ${ALX_UNPRIV_HOME}/.xtdesktop
+ 	install -d ${ALX_UNPRIV_HOME}/.idesktop
+ 	# add shutdown, reboot icons
+ 	local name
+ 	# default settings
+ 	declare -i x=30
+ 	declare -i y=30
+ 	for i in shutdown reboot
+ 	do
+ 		case ${i} in
+ 			shutdown) name="Herunterfahren" ;;
+ 			reboot) name="Neustarten" ;;
+ 		esac
+ 		generate_icon \
+ 			--name "${name}" \
+ 			--command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
+ 			--icon "${ALX_SESSIONS_ICONS}/${i}.png" \
+ 			--dest "${dest}/${i}.lnk" \
+ 			--xres "${x}" \
+ 			--yres "${y}"
+ 		y=$((${y} + 80))
+ 	done
  	# last but not least gen a icon with some sys informations
  	local sysinfo
-Line 645 
 import_settings_local()
+Line 696 
 import_settings_local()
  		--name "${sysinfo}" \
  		--command "exit 0" \
  		--icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
- 		--dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \
+ 		--dest "${ALX_UNPRIV_HOME}/.idesktop/sysinfo.lnk" \
  		--xres "${xres}" \
  		--yres "${yres}" \
  		--icon-width "1" \
  		--icon-height "1"
- 	# create a xinitrc
- 	echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc
  	# set correct permissions
  	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
  	chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
  	chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
- 	chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
+ 	chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
- 	chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc
+ 	if [ -f ${ALX_UNPRIV_HOME}/.ideskrc ]
- 	chmod 0644 ${ALX_UNPRIV_HOME}/.xinitrc
+ 	then
+ 		chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
+ 	fi
  }
  # start|stop
  preliminary_network()
  {
  	local module
- 	local modulesconf
  	if [ -f /etc/alxconfig-ng/state/configured ]
  	then
-Line 679 
 preliminary_network()
+Line 728 
 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 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
-Line 705 
 preliminary_network()
+Line 743 
 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 dhcpcd > /dev/null
+ 			if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
  			then
- 				echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}
+ 				rc_mecho "Forcing network down"
- 				dhcpcd -k
+ 				killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
  				sleep 1
- 			else
- 				rm -f /var/run/dhcpcd-eth?.pid
  			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} ${ALX_IFACE} &> /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
  			;;
  		*)
- 			echo "Usage: preliminary_network {start|stop}"
+ 			rc_echo "Usage: preliminary_network {start|stop}"
  			;;
  	esac
  }
-Line 756 
 preliminary_network()
+Line 790 
 preliminary_network()
  reset_system_settings()
  {
  	# force load of de kbdkeys
- 	loadkeys -q de
+ 	[ -x /usr/bin/loadkeys ] && loadkeys -q de
- 	echo
+ 	[ -x /sbin/loadkmap ] && loadkmap < /usr/share/busybox/keymaps/de.kmap
- 	echo -en ${COLRED}
+ 	rc_echo
- 	echo -n "*** Warning: you are about to reset *all* local settings on this system!"
+ 	rc_echo -en "${COLRED}"
- 	echo -e ${COLDEFAULT}
+ 	rc_echo -n '--- Warning: you are about to reset *all* local settings on this system!'
- 	echo "*** Do you really want to continue ?"
+ 	rc_echo -e "${COLDEFAULT}"
- 	echo -n "*** Enter 'yes' to continue, anything else to abort: "
+ 	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}
+ 		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}/*
+ 		rm -rf ${SETTINGSPATH}
  		rm -f /etc/alxconfig-ng/serial
  		rm -rf /etc/alxconfig-ng/state
+ 		local i
+ 		for i in xserver netcard knoppix mouse
+ 		do
+ 			[[ -f /etc/conf.d/hwsetup/${i} ]] && rm /etc/conf.d/hwsetup/${i}
+ 		done
  		# 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 nmbd &> /dev/null
- 		rc-config del samba &> /dev/null
  		# remove all user settings
  		[ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
+ 		install -o ${ALX_UNPRIV_USER} -g ${ALX_UNPRIV_GROUP} -d ${ALX_UNPRIV_HOME}
  		# remove all ica-sessions
- 		find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs rm
+ 		find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs --no-run-if-empty rm
  		# remove all old nics and modules configs
- 		find /etc/conf.d -type f -name 'net.*' | xargs rm
+ 		find /etc/conf.d -type f -name 'net.*' | xargs --no-run-if-empty rm
- 		find /etc/modules.d -type f -name 'net.*' | xargs rm
+ 		find /etc/modprobe.d -type f -name 'net.*' | xargs --no-run-if-empty rm
  		# restore default networking
  		cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0
+ 		local CONFIG="/etc/hostname"
+ 		clearconfig
+ 		addconfig "${ALX_DEFAULT_HOSTNAME}"
- 		echo "I am done now, press [Enter] to reboot system ..."
+ 		rc_echo -n "I am done now, press [Enter] to reboot system ..."
  	else
- 		echo "Aborted, press [Enter] to reboot system ..."
+ 		rc_echo -n "Aborted, press [Enter] to reboot system ..."
  	fi
  	read
- 	reboot
+ 	sync
+ 	mount -oremount,ro /
+ 	reboot -f
  }
  onboot_interface_list()
-Line 932 
 case $1 in
+Line 976 
 case $1 in
  		[ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
  		sleep 0.1
  		;;
  	*)
- 		echo "Usage: $0 {start|stop} ..."
+ 		rc_echo "Usage: $0 {start|stop} ..."
  		;;
  esac

 Legend:



Removed from v.2008
 


changed lines


 
Added in v.3476
 Legend:



Removed from v.2008
 


changed lines


 
Added in v.3476
-Removed from v.2008
+Added in v.3476