/[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

-alx-src/trunk/alxconfig-ng/init.d/alxsettings
revision 368 by niro,
Tue Oct 11 12:10:15 2005 UTC
+alx-src/branches/alxconf-060/init.d/alxsettings
revision 2010 by niro,
Mon May  9 15:44:33 2011 UTC
 Line 1
  #!/bin/bash
+ # $Id$
  # <niro@magellan-linux.de>
- #%rlevels: 7:s 0:k 6:k
+ #%rlevels: 7:s 0:k
  #%start: 41
  #%stop: 01
 Line 11
  #%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
-Line 21
+Line 19
  # 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
-Line 37 
 source /usr/lib/alxconfig-ng/functions/c
+Line 35 
 source /usr/lib/alxconfig-ng/functions/c
  source /usr/lib/alxconfig-ng/functions/config_x11
  source /usr/lib/alxconfig-ng/functions/config_auth
  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
-Line 93 
 update_system_settings()
+Line 89 
 update_system_settings()
  	# exchange ssh rsa keys
  	HOME=/root config_ssh_auth
+ 	# import version info
+ 	config_version
  }
  get_system_serial()
-Line 122 
 get_system_serial()
+Line 121 
 get_system_serial()
  			exit 1
  		fi
- 		CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
+ 		CUR_IP=$(ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
- 		CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
+ 		CUR_MAC=$(ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
  		CUR_MTIME=$(date +%s)
  		echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
-Line 139 
 get_system_serial()
+Line 138 
 get_system_serial()
  		else
  			# abort on non valid serial
  			ALX_STATE="invalid serial"
- 			echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
+ 			echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
  			show_invalid_serial_msg
  			exit 1
  		fi
-Line 150 
 get_system_serial()
+Line 149 
 get_system_serial()
  		if [[ ${ALX_FORCED_RECHECK} = true ]]
  		then
  			echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}
+ 			# always disable CONFD_NETWORKING here
+ 			export ALX_CONFD_NETWORKING="false"
  		else
  			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
-Line 205 
 get_system_serial()
+Line 206 
 get_system_serial()
  			fi
  			# write current state to temp file
- 			echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
+ 			echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
  			[ -f /hardware-auto-detection ] && rm /hardware-auto-detection
  			# now export ALX_FORCED_RECHECK=true
-Line 230 
 get_system_serial()
+Line 231 
 get_system_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
+ 			echo "ALX_SERIAL=\"${ALX_SERIAL}\"" > /etc/alxconfig-ng/serial
- 			echo "ALX_REG_DATE=${CUR_MTIME}" >> /etc/alxconfig-ng/serial
+ 			echo "ALX_REG_DATE=\"${CUR_MTIME}\"" >> /etc/alxconfig-ng/serial
  			evaluate_retval
  		else
-Line 250 
 get_system_serial()
+Line 251 
 get_system_serial()
  	fi
  	# write current state to temp file
- 	echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
+ 	echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
- 	echo "ALX_IFACE=${ALX_IFACE}" >> /etc/alxconfig-ng/state/state
+ 	echo "ALX_IFACE=\"${ALX_IFACE}\"" >> /etc/alxconfig-ng/state/state
  }
-Line 276 
 import_settings_to_db()
+Line 277 
 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/sysconfig/hwsetup/knoppix
+ 	source /etc/conf.d/hwsetup/knoppix
- 	source /etc/sysconfig/hwsetup/mouse
+ 	source /etc/conf.d/hwsetup/mouse
  	echo
  	echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
-Line 377 
 import_settings_to_db()
+Line 378 
 import_settings_to_db()
  			module,
  			resolution,
  			depth,
- 			monitorid
+ 			refresh_rate
  		)
  		values(
  			'${ALX_SERIAL}',
  			'${XMODULE}',
  			'1024x768',
  			'16',
- 			'0'
+ 			'60'
  		);"; )
  	evaluate_retval
-Line 427 
 import_settings_to_db()
+Line 428 
 import_settings_to_db()
  	echo -e "      Screensaver settings ..."
  	mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"
+ 	# version info
+ 	local alx_os
+ 	local alx_utils
+ 	alx_os="$(< /etc/mageversion)"
+ 	alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
+ 	alx_utils="${alx_utils/alxconfig-ng-alx-}"
+ 	mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"
  	evaluate_retval
  }
-Line 441 
 update_settings_in_db()
+Line 450 
 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/sysconfig/hwsetup/knoppix
+ 	source /etc/conf.d/hwsetup/knoppix
- 	source /etc/sysconfig/hwsetup/mouse
+ 	source /etc/conf.d/hwsetup/mouse
  	echo
  	echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}
-Line 509 
 update_settings_in_db()
+Line 518 
 update_settings_in_db()
  			module='${XMODULE}',
  			resolution='1024x768',
  			depth='16',
- 			monitorid='0'
+ 			refresh_rate='60'
  		where serial=${ALX_SERIAL};"
  	evaluate_retval
-Line 517 
 update_settings_in_db()
+Line 526 
 update_settings_in_db()
  	echo -e "      Input settings ..."
  	mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"
  	evaluate_retval
+ 	# version info
+ 	local alx_os
+ 	local alx_utils
+ 	alx_os="$(< /etc/mageversion)"
+ 	alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
+ 	alx_utils="${alx_utils/alxconfig-ng-alx-}"
+ 	mysqldo "update client_version set os='${alx_os}', utils='${alx_utils}' where serial=${ALX_SERIAL};"
  }
  # imports current settings to the local system resolved by the hardware detection
-Line 530 
 import_settings_local()
+Line 547 
 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/sysconfig/hwsetup/knoppix
+ 	source /etc/conf.d/hwsetup/knoppix
  	echo
  	echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}
-Line 546 
 import_settings_local()
+Line 563 
 import_settings_local()
  		#[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
  		#echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules
- 		# set an device alias for modprobe.conf
+ 		# 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
  		# regenerate modprobe.conf
  		[ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"
-Line 558 
 import_settings_local()
+Line 577 
 import_settings_local()
  	# set system state to 'already configured'
  	touch /etc/alxconfig-ng/state/configured
+ 	# install slim desktopmanager configuration
+ 	config_display_manager
  	# if only an recheck was forced than abort now
  	[[ ${ALX_FORCED_RECHECK} = true ]] && return 0
-Line 645 
 import_settings_local()
+Line 667 
 import_settings_local()
  preliminary_network()
  {
  	local module
+ 	local modulesconf
  	if [ -f /etc/alxconfig-ng/state/configured ]
  	then
-Line 655 
 preliminary_network()
+Line 678 
 preliminary_network()
  			module=$(cat ${SETTINGSPATH}/modules)
  			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/sysconfig/hwsetup/knoppix
+ 		source /etc/conf.d/hwsetup/knoppix
  		modprobe ${NETCARD_DRIVER}
  	fi
-Line 670 
 preliminary_network()
+Line 705 
 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 ps -A|grep udhcpc > /dev/null
  			then
  				echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}
- 				dhcpcd -k
+ 				killall udhcpc
  				sleep 1
- 			else
- 				rm -f /var/run/dhcpcd-eth?.pid
  			fi
  			[[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \
  				${rc_base}/init.d/network stop
-Line 707 
 preliminary_network()
+Line 740 
 preliminary_network()
  			if ps -A|grep dhcpcd > /dev/null
  			then
  				dhcpcd -z  &> /dev/null
+ 				sleep 1
  			fi
  			evaluate_retval
  			;;

 Legend:



Removed from v.368
 


changed lines


 
Added in v.2010
 Legend:



Removed from v.368
 


changed lines


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