X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/6516b8e39a52b3df85edc753aeb3bfe45ab8b66e..99cfd3e2e8039488f4e69cfc275516f71b219b7f:/openwrt/target/default/target_skeleton/sbin/ifup?ds=sidebyside

diff --git a/openwrt/target/default/target_skeleton/sbin/ifup b/openwrt/target/default/target_skeleton/sbin/ifup
index 6b4a7740b..4236de06b 100755
--- a/openwrt/target/default/target_skeleton/sbin/ifup
+++ b/openwrt/target/default/target_skeleton/sbin/ifup
@@ -45,23 +45,15 @@
       } done
     ;;
     dhcp)
+      ip=$(nvram get ${type}_ipaddr)
       pidfile=/tmp/dhcp-${type}.pid
       if [ -f $pidfile ]; then
         $DEBUG kill $(cat $pidfile)
       fi
-      ${DEBUG:-eval} "udhcpc -i $if -b -p $pidfile &" 
+      ${DEBUG:-eval} "udhcpc -i $if ${ip:+-r $ip} -b -p $pidfile &" 
     ;;
     pppoe)
-      username=$(nvram get ppp_username)
-      password=$(nvram get ppp_passwd)
-      redial=$(nvram get ppp_redialperiod)
-      idletime=$(nvram get ppp_idletime)
-      mtu=$(nvram get wan_mtu)
-
-      $DEBUG ifconfig $if 0.0.0.0 up
-
-      $DEBUG /sbin/pppoecd $if -u $username -p $password \
-        -i 0 -I $redial -T $idletime -t $mtu -k
+	# handled by /etc/init.d/S50pppoe
     ;;
     none)
     ;;