various cosmetic fixes

[openwrt.git] / target / default / target_skeleton / sbin / ifup

diff --git a/target/default/target_skeleton/sbin/ifup b/target/default/target_skeleton/sbin/ifup
index f8e41ce..f3230ba 100755 (executable)
--- a/target/default/target_skeleton/sbin/ifup
+++ b/target/default/target_skeleton/sbin/ifup
@@ -45,28 +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)
-
-#      handled by /etc/init.d/S50pppoe
-#      $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