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

Parent Directory | Revision Log | Patch

	revision 2008 by niro, Mon May 9 15:35:49 2011 UTC	revision 2011 by niro, Mon May 9 15:48:19 2011 UTC
#	Line 155  get_system_serial()	Line 155  get_system_serial()
155	echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}	echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
156	fi	fi
157	ALX_HW_DETECT=true	ALX_HW_DETECT=true
158	/etc/init.d/hwdetect start	hwsetup
159
160	# set hostname to alx_default_hostname	# set hostname to alx_default_hostname
161	# use old hostname if this is a forced re-check	# use old hostname if this is a forced re-check
#	Line 277  import_settings_to_db()	Line 277  import_settings_to_db()
277	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
278	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
279
280	# vars used by hwdetect	# vars used by hwsetup
281	local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME	local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
282	local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER	local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
283	local MOUSETYPE XMOUSETYPE FULLNAME DEVICE	local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
284
285	# get setting from hwdetect	# get setting from hwsetup
286	source /etc/conf.d/hwsetup/knoppix	source /etc/conf.d/hwsetup/knoppix
287	source /etc/conf.d/hwsetup/mouse	source /etc/conf.d/hwsetup/mouse
288
#	Line 450  update_settings_in_db()	Line 450  update_settings_in_db()
450	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
451	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
452
453	# vars used by hwdetect	# vars used by hwsetup
454	local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME	local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
455	local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER	local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
456	local MOUSETYPE XMOUSETYPE FULLNAME DEVICE	local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
457
458	# get setting from hwdetect	# get setting from hwsetup
459	source /etc/conf.d/hwsetup/knoppix	source /etc/conf.d/hwsetup/knoppix
460	source /etc/conf.d/hwsetup/mouse	source /etc/conf.d/hwsetup/mouse
461
#	Line 547  import_settings_local()	Line 547  import_settings_local()
547	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain	[ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
548	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx	[ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
549
550	# vars used by hwdetect	# vars used by hwsetup
551	local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME	local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
552	local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER	local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
553	local MOUSETYPE XMOUSETYPE FULLNAME DEVICE	local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
554
555	# get setting from hwdetect	# get setting from hwsetup
556	source /etc/conf.d/hwsetup/knoppix	source /etc/conf.d/hwsetup/knoppix
557
558	echo	echo
#	Line 691  preliminary_network()	Line 691  preliminary_network()
691	modules-update force	modules-update force
692	fi	fi
693	else	else
694	# vars used by hwdetect	# vars used by hwsetup
695	local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME	local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
696	local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER	local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
697
698	# get setting from hwdetect	# get setting from hwsetup
699	source /etc/conf.d/hwsetup/knoppix	source /etc/conf.d/hwsetup/knoppix
700	modprobe ${NETCARD_DRIVER}	modprobe ${NETCARD_DRIVER}
701	fi	fi
#	Line 705  preliminary_network()	Line 705  preliminary_network()
705	# keeping like always safe:	# keeping like always safe:
706	# no network should be startet here,	# no network should be startet here,
707	# so we can delete all pid files if one exists	# so we can delete all pid files if one exists
708	if ps -A|grep dhcpcd > /dev/null	if ps -A|grep udhcpc > /dev/null
709	then	then
710	echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}	echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}
711	dhcpcd -k	killall udhcpc &> /dev/null
712	sleep 1	sleep 1
	else
	rm -f /var/run/dhcpcd-eth?.pid
713	fi	fi
714	[[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \	[[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \
715	${rc_base}/init.d/network stop	${rc_base}/init.d/network stop
#	Line 725  preliminary_network()	Line 723  preliminary_network()
723	else	else
724	echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}	echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}
725	# -t 10 timeout of 10 secs	# -t 10 timeout of 10 secs
726	dhcpcd -t 10 &> /dev/null	udhcpc -t 10 &> /dev/null
727	evaluate_retval	evaluate_retval
728	fi	fi
729	;;	;;

---

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

Legend: Removed from v.2008   changed lines   Added in v.2011