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

Parent Directory | Revision Log | Patch

	revision 2471 by niro, Mon Jun 27 15:14:05 2011 UTC	revision 2748 by niro, Thu Aug 11 19:51:11 2011 UTC
#	Line 30  source /usr/lib/alxconfig-ng/functions/c	Line 30  source /usr/lib/alxconfig-ng/functions/c
30	source /usr/lib/alxconfig-ng/functions/mysqlfunctions	source /usr/lib/alxconfig-ng/functions/mysqlfunctions
31	source /usr/lib/alxconfig-ng/functions/serial_functions	source /usr/lib/alxconfig-ng/functions/serial_functions
32	source /usr/lib/alxconfig-ng/functions/config_modules	source /usr/lib/alxconfig-ng/functions/config_modules
33		source /usr/lib/alxconfig-ng/functions/config_plugins
34	source /usr/lib/alxconfig-ng/functions/config_network	source /usr/lib/alxconfig-ng/functions/config_network
35	source /usr/lib/alxconfig-ng/functions/config_printers	source /usr/lib/alxconfig-ng/functions/config_printers
36	source /usr/lib/alxconfig-ng/functions/config_sessions	source /usr/lib/alxconfig-ng/functions/config_sessions
#	Line 59  update_system_settings()	Line 60  update_system_settings()
60	# ! is the first thing that must be configured !	# ! is the first thing that must be configured !
61	config_modules	config_modules
62
63		# install or uninstall plugins
64		config_plugins
65
66	# imports network settings from db	# imports network settings from db
67	config_networking	config_networking
68
#	Line 165  get_system_serial()	Line 169  get_system_serial()
169	fi	fi
170
171
172	CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')	CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
173	CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)	CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
174	CUR_MTIME=$(date +%s)	CUR_MTIME=$(date +%s)
175
176	# abort now if this is a forced re-check	# abort now if this is a forced re-check
#	Line 420  import_settings_to_db()	Line 424  import_settings_to_db()
424	local alx_os	local alx_os
425	local alx_utils	local alx_utils
426	alx_os="$(< /etc/mageversion)"	alx_os="$(< /etc/mageversion)"
427	alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"	alx_utils="$(magequery -n alxconfig-ng | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
428	alx_utils="${alx_utils/alxconfig-ng-alx-}"	alx_utils="${alx_utils/alxconfig-ng-}"
429	mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"	mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"
430
431	evaluate_retval	evaluate_retval
#	Line 551  import_settings_local()	Line 555  import_settings_local()
555	then	then
556	# set an device alias for modprobe.conf	# set an device alias for modprobe.conf
557	[ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d	[ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
558	echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0.conf	# update only if not the same (to speed up bootprocess - no depmod)
559		CONFIG="/etc/modprobe.d/net.${ALX_IFACE}.conf"
560		clearconfig
561		addconfig "alias ${ALX_IFACE} ${cfg_network_module}"
562
563		# update confd-networking default iface
564		[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
565		CONFIG="${SETTINGSPATH}/confd-networking"
566		clearconfig
567		addconfig "${ALX_IFACE}"
568
569	# regenerate modprobe.conf	# regenerate modprobe.conf
570	[ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!"	[ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!"
#	Line 636  import_settings_local()	Line 649  import_settings_local()
649	for i in shutdown reboot	for i in shutdown reboot
650	do	do
651	case ${i} in	case ${i} in
652	shutdown) name="Herunterfahren"	shutdown) name="Herunterfahren" ;;
653	reboot) name="Neustarten"	reboot) name="Neustarten" ;;
654	esac	esac
655
656	generate_icon \	generate_icon \
#	Line 734  preliminary_network()	Line 747  preliminary_network()
747	${rc_base}/init.d/network start	${rc_base}/init.d/network start
748	else	else
749	rc_print "Starting default dhcp based networking ... "	rc_print "Starting default dhcp based networking ... "
750	${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null	${ALX_DHCP_PROG} ${ALX_DHCP_START} ${ALX_IFACE} &> /dev/null
751	evaluate_retval	evaluate_retval
752	fi	fi
753	;;	;;

---

Colored Diff Long Colored Diff Full Colored Diff Unidiff Context Diff Side by Side

Legend: Removed from v.2471   changed lines   Added in v.2748