From 19a1490f400695cadb7b94fe70cde19d6c45bc8f Mon Sep 17 00:00:00 2001
From: mbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Mon, 30 May 2005 09:09:58 +0000
Subject: make dnsmasq probe for dhcp servers before starting a dhcp server

git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@1110 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 target/default/target_skeleton/sbin/ifup | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'target/default/target_skeleton/sbin')

diff --git a/target/default/target_skeleton/sbin/ifup b/target/default/target_skeleton/sbin/ifup
index 9759f8d4d..60f9a1730 100755
--- a/target/default/target_skeleton/sbin/ifup
+++ b/target/default/target_skeleton/sbin/ifup
@@ -10,6 +10,7 @@
 
   if_valid $if || return
 
+  mac=$(nvram get ${type}_hwaddr)
   $DEBUG ifconfig $if down 2>&-
   if [ "${if%%[0-9]}" = "br" ]; then
     stp=$(nvram get ${type}_stp)
@@ -19,13 +20,14 @@
     $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
-- 
cgit v1.2.3