summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAn-Cheng Huang <ancheng@vyatta.com>2007-12-07 18:37:56 -0800
committerAn-Cheng Huang <ancheng@vyatta.com>2007-12-07 18:37:56 -0800
commit5ba8cf8393030d75c03a15551a57831f3f0908a4 (patch)
treec7073450258ecaa47a94f08aaa20d4c05a6f9155
parent1041db879c6bdfa86f6a8b19e1542475db6dffc9 (diff)
downloadvyatta-cfg-system-5ba8cf8393030d75c03a15551a57831f3f0908a4.tar.gz
vyatta-cfg-system-5ba8cf8393030d75c03a15551a57831f3f0908a4.zip
fix ifrename problem: make sure there's no interface name overlap, and don't
use "-t" with ifrename.
-rwxr-xr-xscripts/rl-system.init14
1 files changed, 13 insertions, 1 deletions
diff --git a/scripts/rl-system.init b/scripts/rl-system.init
index 82451b60..779a7610 100755
--- a/scripts/rl-system.init
+++ b/scripts/rl-system.init
@@ -167,6 +167,16 @@ write_iftab ()
rm -f $IFTAB
for i in ${!cfg_eth_hwid[@]} ; do
+ echo "etha$i mac ${cfg_eth_hwid[$i]}" >> $IFTAB
+ done
+}
+
+write_iftab_real ()
+{
+ local -i i
+
+ rm -f $IFTAB
+ for i in ${!cfg_eth_hwid[@]} ; do
echo "eth$i mac ${cfg_eth_hwid[$i]}" >> $IFTAB
done
}
@@ -253,7 +263,7 @@ itfmess ()
maybe_ifrename () {
if [ -e $IFTAB ] ; then
- ifrename -d -p -t
+ ifrename -d -p
fi
}
@@ -324,6 +334,8 @@ start () {
set_reboot_on_panic
itfmess
maybe_ifrename
+ write_iftab_real
+ maybe_ifrename
add_new_serial_if
reset_promiscous_arp_response
set_ip_forwarding