/[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 1800 by niro,
Thu Apr 14 19:29:35 2011 UTC
+revision 2014 by niro,
Mon May  9 16:01:06 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 39 
 source /usr/lib/alxconfig-ng/functions/c
+Line 37 
 source /usr/lib/alxconfig-ng/functions/c
  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
  ALX_FORCED_RECHECK=false
-Line 126 
 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 160 
 get_system_serial()
+Line 155 
 get_system_serial()
  			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 282 
 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 455 
 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 552 
 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 672 
 import_settings_local()
+Line 667 
 import_settings_local()
  preliminary_network()
  {
  	local module
- 	local modulesconf
  	if [ -f /etc/alxconfig-ng/state/configured ]
  	then
-Line 683 
 preliminary_network()
+Line 677 
 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
- 			/sbin/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 710 
 preliminary_network()
+Line 693 
 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 &> /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
-Line 730 
 preliminary_network()
+Line 711 
 preliminary_network()
  			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
  			;;
-Line 744 
 preliminary_network()
+Line 725 
 preliminary_network()
  				echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}
  				ifconfig eth0 down
  			fi
- 			if ps -A|grep dhcpcd > /dev/null
+ 			if ps -A|grep udhcpc > /dev/null
  			then
- 				dhcpcd -z  &> /dev/null
+ 				killall udhcpc  &> /dev/null
  				sleep 1
  			fi
  			evaluate_retval

 Legend:



Removed from v.1800
 


changed lines


 
Added in v.2014
 Legend:



Removed from v.1800
 


changed lines


 
Added in v.2014
-Removed from v.1800
+Added in v.2014