[pisa-src] r929 - trunk/tools
- From: Diego Biurrun <diego@xxxxxxxxxx>
- To: pisa-src@xxxxxxxxxxxxx
- Date: Fri, 04 Sep 2009 14:25:43 +0200
Author: biurrun
Date: Fri Sep 4 14:25:42 2009
New Revision: 929
Log:
Reduce differences between switch-ip scripts.
Modified:
trunk/tools/switch-ip.bareasus
trunk/tools/switch-ip.owrtasus
Modified: trunk/tools/switch-ip.bareasus
==============================================================================
--- trunk/tools/switch-ip.bareasus Fri Sep 4 13:07:48 2009 (r928)
+++ trunk/tools/switch-ip.bareasus Fri Sep 4 14:25:42 2009 (r929)
@@ -11,6 +11,12 @@
IFWLAN="eth1"
IFDUMMY="dummy0"
+DHCPC="udhcpc"
+#DHCPC="dhclient"
+
+DHCPCMD="$DHCPC -i $IFWLAN"
+#DHCPCMD="$DHCPC -q $IFWLAN"
+
# my IP address (host part)
MYIP1="192.168.5.101"
MYIP2="192.168.5.101"
@@ -211,9 +217,6 @@
echo "arp -d $AP_IP"
arp -d $AP_IP 2> /dev/null
-
- #echo "arp -s 192.168.7.28 $NEW_MAC_ADR"
- #arp -s 192.168.7.28 $NEW_MAC_ADR
fi
if [ "$CMD" = "ifconfig" ]; then
@@ -245,15 +248,15 @@
echo "iwconfig $IFWLAN essid $NEW_SSID ap $NEW_MAC_ADR"
iwconfig $IFWLAN essid "$NEW_SSID" ap "$NEW_MAC_ADR"
- echo "killall udhcpc"
- killall udhcpc
+ echo "killall $DHCPC"
+ killall $DHCPC
echo "Deleting routing table entries for $IFWLAN..."
delroute
echo "Getting a new IP configuration for $IFWLAN via DHCP..."
- echo "udhcpc -i $IFWLAN"
- udhcpc -i $IFWLAN
+ echo "$DHCPCMD"
+ $DHCPCMD
echo "route add -net $DESTINATION netmask $NETMASK gw $AP_IP"
route add -net $DESTINATION netmask $NETMASK gw $AP_IP
Modified: trunk/tools/switch-ip.owrtasus
==============================================================================
--- trunk/tools/switch-ip.owrtasus Fri Sep 4 13:07:48 2009 (r928)
+++ trunk/tools/switch-ip.owrtasus Fri Sep 4 14:25:42 2009 (r929)
@@ -11,6 +11,12 @@
IFWLAN="eth1"
IFDUMMY="dummy0"
+DHCPC="udhcpc"
+#DHCPC="dhclient"
+
+DHCPCMD="$DHCPC -i $IFWLAN"
+#DHCPCMD="$DHCPC -q $IFWLAN"
+
# my IP address (host part)
MYIP1="192.168.6.101"
MYIP2="192.168.6.101"
@@ -211,9 +217,6 @@
echo "arp -d $AP_IP"
arp -d $AP_IP 2> /dev/null
-
- #echo "arp -s 192.168.7.28 $NEW_MAC_ADR"
- #arp -s 192.168.7.28 $NEW_MAC_ADR
fi
if [ "$CMD" = "ifconfig" ]; then
@@ -245,15 +248,15 @@
echo "iwconfig $IFWLAN essid $NEW_SSID ap $NEW_MAC_ADR"
iwconfig $IFWLAN essid "$NEW_SSID" ap "$NEW_MAC_ADR"
- echo "killall udhcpc"
- killall udhcpc
+ echo "killall $DHCPC"
+ killall $DHCPC
echo "Deleting routing table entries for $IFWLAN..."
delroute
echo "Getting a new IP configuration for $IFWLAN via DHCP..."
- echo "udhcpc -i $IFWLAN"
- udhcpc -i $IFWLAN
+ echo "$DHCPCMD"
+ $DHCPCMD
echo "route add -net $DESTINATION netmask $NETMASK gw $AP_IP"
route add -net $DESTINATION netmask $NETMASK gw $AP_IP
Other related posts:
- » [pisa-src] r929 - trunk/tools - Diego Biurrun
