summaryrefslogtreecommitdiff
path: root/target/default/target_skeleton/sbin
diff options
context:
space:
mode:
authormbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-30 09:09:58 +0000
committermbm <mbm@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-05-30 09:09:58 +0000
commit19a1490f400695cadb7b94fe70cde19d6c45bc8f (patch)
treedd2c97b19abc4292f9cd24b0af9f72e0c4af755f /target/default/target_skeleton/sbin
parent64caeb211dbae2b992463d484d6ddaae852b7de2 (diff)
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
Diffstat (limited to 'target/default/target_skeleton/sbin')
-rwxr-xr-xtarget/default/target_skeleton/sbin/ifup8
1 files changed, 5 insertions, 3 deletions
diff --git a/target/default/target_skeleton/sbin/ifup b/target/default/target_skeleton/sbin/ifup
index 9759f8d4d5..60f9a17302 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