X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/ae6571a883177875963f4b1992dc6fc8b8c3029a..934e35c9dc1f189fe6714edd7d3f05d6918e07ba:/target/default/target_skeleton/sbin/ifup

diff --git a/target/default/target_skeleton/sbin/ifup b/target/default/target_skeleton/sbin/ifup
index f3230ba41..60f9a1730 100755
--- a/target/default/target_skeleton/sbin/ifup
+++ b/target/default/target_skeleton/sbin/ifup
@@ -10,22 +10,24 @@
 
   if_valid $if || return
 
-  $DEBUG ifconfig $if down
+  mac=$(nvram get ${type}_hwaddr)
+  $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}
     for sif in $(nvram get ${type}_ifnames); do {
       if_valid $sif || continue
+      ${mac:+$DEBUG ifconfig $sif down hw ether $mac}
       $DEBUG ifconfig $sif 0.0.0.0 up
       $DEBUG brctl addif $if $sif
     } done
+  else
+    ${mac:+$DEBUG ifconfig $if down hw ether $mac}
   fi
 
-  mac=$(nvram get ${type}_hwaddr)
-  ${mac:+$DEBUG ifconfig $if hw ether $mac}
 
   if_proto=$(nvram get ${type}_proto)
   case "$if_proto" in
@@ -50,7 +52,7 @@
       if [ -f $pidfile ]; then
         $DEBUG kill $(cat $pidfile)
       fi
-      ${DEBUG:-eval} "udhcpc -i $if ${ip:+-r $ip} -b -p $pidfile &" 
+      ${DEBUG:-eval} "udhcpc -R -i $if ${ip:+-r $ip} -b -p $pidfile &" 
     ;;
     none|"")
 	# pppoe is handled by /etc/init.d/S50pppoe