--- alx-src/branches/alxconf-060/init.d/alxsettings 2011/05/09 15:44:33 2010 +++ alx-src/branches/alxconf-060/init.d/alxsettings 2011/05/09 16:01:06 2014 @@ -667,7 +667,6 @@ preliminary_network() { local module - local modulesconf if [ -f /etc/alxconfig-ng/state/configured ] then @@ -679,17 +678,6 @@ 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 hwsetup local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME @@ -708,7 +696,7 @@ if ps -A|grep udhcpc > /dev/null then echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT} - killall udhcpc + killall udhcpc &> /dev/null sleep 1 fi [[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \ @@ -723,7 +711,7 @@ 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 ;; @@ -737,9 +725,9 @@ 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