[Astlinux-commits] SF.net SVN: astlinux: [852] branches/s2s

[<kr...@us...>]

Revision: 852
          http://svn.sourceforge.net/astlinux/?rev=852&view=rev
Author:   krisk84
Date:     2007-04-18 11:30:46 -0700 (Wed, 18 Apr 2007)

Log Message:
-----------
REALLY merge changes from trunk - not commit s2s changes

Modified Paths:
--------------
    branches/s2s/package/wireless-tools/wireless-tools.mk
    branches/s2s/target/generic/target_skeleton/etc/init.d/network

Modified: branches/s2s/package/wireless-tools/wireless-tools.mk
===================================================================
--- branches/s2s/package/wireless-tools/wireless-tools.mk	2007-04-18 18:27:17 UTC (rev 851)
+++ branches/s2s/package/wireless-tools/wireless-tools.mk	2007-04-18 18:30:46 UTC (rev 852)
@@ -39,6 +39,8 @@
 	$(INSTALL) -D -m 0755 $(WIRELESS_TOOLS_BUILD_DIR)/ifrename $(TARGET_DIR)/usr/sbin/ifrename
 	$(INSTALL) -D -m 0644 $(WIRELESS_TOOLS_BUILD_DIR)/libiw.so.$(WIRELESS_TOOLS_VER) \
 	$(TARGET_DIR)/usr/lib/libiw.so.$(WIRELESS_TOOLS_VER)
+	ln -s /tmp/etc/iftab $(TARGET_DIR)/etc/iftab
+	ln -s /tmp/etc/iftab.init $(TARGET_DIR)/etc/iftab.init
 
 wireless-tools: $(TARGET_DIR)/sbin/iwconfig
 

Modified: branches/s2s/target/generic/target_skeleton/etc/init.d/network
===================================================================
--- branches/s2s/target/generic/target_skeleton/etc/init.d/network	2007-04-18 18:27:17 UTC (rev 851)
+++ branches/s2s/target/generic/target_skeleton/etc/init.d/network	2007-04-18 18:30:46 UTC (rev 852)
@@ -3,6 +3,39 @@
 . /etc/rc.conf
 
 init () {
+if [ "$IFRENAME" ]
+then
+
+#clear existing iftabs
+echo -n > /tmp/etc/iftab
+echo -n > /tmp/etc/iftab.init
+
+#set COUNT
+COUNT=10
+
+for i in $IFRENAME
+do
+IF=`echo $i | cut -d: -f1`
+DRIVER=`echo $i | cut -d: -f2`
+ID=`echo $i | cut -d: -f3`
+
+COUNT=`expr $COUNT - 1`
+
+if `echo $ID | grep -q i`
+then
+RID=`echo $ID | tr -d i`
+echo "eth"$COUNT" driver $DRIVER interrupt $RID" >> /tmp/etc/iftab.init
+fi
+
+if `echo $ID | grep -q i`
+then
+RID=`echo $ID | tr -d i`
+echo "$IF driver $DRIVER interrupt $RID" >> /tmp/etc/iftab
+fi
+
+done
+fi
+
 if [ -r /etc/iftab.init ]
 then
 echo "Remapping interfaces (init)..."


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.