From 5ba8cf8393030d75c03a15551a57831f3f0908a4 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Fri, 7 Dec 2007 18:37:56 -0800
Subject: fix ifrename problem: make sure there's no interface name overlap,
 and don't use "-t" with ifrename.

---
 scripts/rl-system.init | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'scripts')

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
@@ -165,6 +165,16 @@ write_iftab ()
 {
     local -i i
 
+    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
@@ -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
-- 
cgit v1.2.3