X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/51d47ba15e193e6c95a82784878601e1c1de44f4..1e0023f856d0892dae7a020914f91d0aafb587f3:/target/default/target_skeleton/sbin/ifup?ds=inline

diff --git a/target/default/target_skeleton/sbin/ifup b/target/default/target_skeleton/sbin/ifup
index 6b4a7740b..9759f8d4d 100755
--- a/target/default/target_skeleton/sbin/ifup
+++ b/target/default/target_skeleton/sbin/ifup
@@ -10,10 +10,10 @@
 
   if_valid $if || return
 
-  $DEBUG ifconfig $if down
+  $DEBUG ifconfig $if down 2>&-
   if [ "${if%%[0-9]}" = "br" ]; then
     stp=$(nvram get ${type}_stp)
-    $DEBUG brctl delbr $if
+    $DEBUG brctl delbr $if 2>&-
     $DEBUG brctl addbr $if
     $DEBUG brctl setfd $if 0
     $DEBUG brctl stp $if ${stp:-0}
@@ -45,27 +45,17 @@
       } 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 &" 
-    ;;
-    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
+      ${DEBUG:-eval} "udhcpc -i $if ${ip:+-r $ip} -b -p $pidfile &" 
     ;;
-    none)
+    none|"")
+	# pppoe is handled by /etc/init.d/S50pppoe
     ;;
     *)
-      echo "### WARNING $if: $if_proto is not supported"
+      echo "### ifup $type: ignored ${type}_proto=\"$if_proto\" (not supported)"
     ;;
   esac