Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alxconf-060/init.d/alxsettings

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

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 2508 by niro, Mon Jun 27 15:20:33 2011 UTC revision 2509 by niro, Thu Jun 30 14:44:36 2011 UTC
    # Line 165  get_system_serial() Line 165  get_system_serial()
    165   fi   fi
    166    
    167    
    168   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
    169   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
    170   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
    171    
    172   # abort now if this is a forced re-check   # abort now if this is a forced re-check
    # Line 551  import_settings_local() Line 551  import_settings_local()
    551   then   then
    552   # set an device alias for modprobe.conf   # set an device alias for modprobe.conf
    553   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
    554   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0.conf   # update only if not the same (to speed up bootprocess - no depmod)
    555     CONFIG="/etc/modprobe.d/net.${ALX_IFACE}.conf"
    556     clearconfig
    557     addconfig "alias ${ALX_IFACE} ${cfg_network_module}"
    558    
    559     # update confd-networking default iface
    560     [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
    561     CONFIG="${SETTINGSPATH}/confd-networking"
    562     clearconfig
    563     addconfig "${ALX_IFACE}"
    564    
    565   # regenerate modprobe.conf   # regenerate modprobe.conf
    566   [ -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 734  preliminary_network() Line 743  preliminary_network()
    743   ${rc_base}/init.d/network start   ${rc_base}/init.d/network start
    744   else   else
    745   rc_print "Starting default dhcp based networking ... "   rc_print "Starting default dhcp based networking ... "
    746   ${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null   ${ALX_DHCP_PROG} ${ALX_DHCP_START} ${ALX_IFACE} &> /dev/null
    747   evaluate_retval   evaluate_retval
    748   fi   fi
    749   ;;   ;;
    Legend:
    Removed from v.2508  
    changed lines
      Added in v.2509