--- alx-src/branches/alxconf-060/init.d/alxsettings 2011/06/30 14:44:03 2508 +++ alx-src/branches/alxconf-060/init.d/alxsettings 2011/06/30 14:44:36 2509 @@ -165,8 +165,8 @@ fi - CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp') - CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11) + CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp') + CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11) CUR_MTIME=$(date +%s) # abort now if this is a forced re-check @@ -551,7 +551,16 @@ then # set an device alias for modprobe.conf [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d - echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0.conf + # update only if not the same (to speed up bootprocess - no depmod) + CONFIG="/etc/modprobe.d/net.${ALX_IFACE}.conf" + clearconfig + addconfig "alias ${ALX_IFACE} ${cfg_network_module}" + + # update confd-networking default iface + [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH} + CONFIG="${SETTINGSPATH}/confd-networking" + clearconfig + addconfig "${ALX_IFACE}" # regenerate modprobe.conf [ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!" @@ -734,7 +743,7 @@ ${rc_base}/init.d/network start else rc_print "Starting default dhcp based networking ... " - ${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null + ${ALX_DHCP_PROG} ${ALX_DHCP_START} ${ALX_IFACE} &> /dev/null evaluate_retval fi ;;