[pkg-wpa-devel] r1262 - in /wpasupplicant/trunk/debian: changelog ifupdown/functions.sh

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Thu Oct  2 20:59:05 2008
New Revision: 1262

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1262
Log:
Adjust debian/ifupdown/functions.sh to use not depend on /sbin/ip to use
ip.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/ifupdown/functions.sh

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1262&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Thu Oct  2 20:59:05 2008
@@ -17,8 +17,10 @@
   * When using wpa-roam and connecting to an interface for which an id_str
     is defined but no matching /e/n/i logical interfaces has been configured,
     try to configure the default logical interface.
-
- -- Kel Modderman <kel at otaku42.de>  Thu, 02 Oct 2008 03:43:25 +1000
+  * Adjust debian/ifupdown/functions.sh to use not depend on /sbin/ip to use
+    ip.
+
+ -- Kel Modderman <kel at otaku42.de>  Fri, 03 Oct 2008 06:57:54 +1000
 
 wpasupplicant (0.6.4-3) experimental; urgency=low
 

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1262&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Thu Oct  2 20:59:05 2008
@@ -1062,10 +1062,10 @@
 # NB: use iproute if present, flushing the IFACE first
 #
 if_post_down_up () {
-	if [ -x /sbin/ip ]; then
-		/sbin/ip addr flush dev "$WPA_IFACE" 2>/dev/null
-		/sbin/ip link set "$WPA_IFACE" up
-	else
-		/sbin/ifconfig "$WPA_IFACE" up
-	fi
-}
+	if type ip >/dev/null; then
+		ip addr flush dev "$WPA_IFACE" 2>/dev/null
+		ip link set "$WPA_IFACE" up
+	else
+		ifconfig "$WPA_IFACE" up
+	fi
+}