/[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 2007 by niro,
Mon May  9 15:31:56 2011 UTC
+revision 2122 by niro,
Mon May 16 11:08:31 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 155 
 get_system_serial()
+Line 156 
 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 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 277 
 import_settings_to_db()
+Line 279 
 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 300 
 import_settings_to_db()
+Line 302 
 import_settings_to_db()
  			[[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
  			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 "insert into cfg_network(
  				hostname,
-Line 450 
 update_settings_in_db()
+Line 452 
 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 473 
 update_settings_in_db()
+Line 475 
 update_settings_in_db()
  			[[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
  			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 547 
 import_settings_local()
+Line 549 
 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}
  	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"
-Line 590 
 import_settings_local()
+Line 587 
 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 659 
 import_settings_local()
  preliminary_network()
  {
  	local module
- 	local modulesconf
  	if [ -f /etc/alxconfig-ng/state/configured ]
  	then
-Line 679 
 preliminary_network()
+Line 670 
 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/sysconfig/hwsetup/knoppix
+ 		source /etc/conf.d/hwsetup/knoppix
  		modprobe ${NETCARD_DRIVER}
  	fi
-Line 705 
 preliminary_network()
+Line 685 
 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 udhcpc) ]]
  			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 ]] && \
+ 			[[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop
- 				${rc_base}/init.d/network stop
  			echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}
-Line 725 
 preliminary_network()
+Line 702 
 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 739 
 preliminary_network()
+Line 716 
 preliminary_network()
  				echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}
  				ifconfig eth0 down
  			fi
- 			if ps -A|grep dhcpcd > /dev/null
+ 			if [[ ! -z $(pidof udhcpc) ]]
  			then
- 				dhcpcd -z  &> /dev/null
+ 				killall udhcpc  &> /dev/null
  				sleep 1
  			fi
  			evaluate_retval
-Line 781 
 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 797 
 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
-Line 932 
 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} ..."
  		;;

 Legend:



Removed from v.2007
 


changed lines


 
Added in v.2122
 Legend:



Removed from v.2007
 


changed lines


 
Added in v.2122
-Removed from v.2007
+Added in v.2122