KVM-test: Drop the absolute path of brctl/ifconfig

Commit Message

Amos Kong May 4, 2011, 6:10 a.m. UTC

The absolute paths of brctl are not same in different
distribution.

Signed-off-by: Amos Kong <[e-mail]>
---
 client/tests/kvm/scripts/qemu-ifup      |   12 ++++++------
 client/tests/kvm/scripts/qemu-ifup-ipv6 |   12 ++++++------
 2 files changed, 12 insertions(+), 12 deletions(-)

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/client/tests/kvm/scripts/qemu-ifup b/client/tests/kvm/scripts/qemu-ifup
index c4debf5..2f9c7fe 100755
--- a/client/tests/kvm/scripts/qemu-ifup
+++ b/client/tests/kvm/scripts/qemu-ifup
@@ -2,10 +2,10 @@ 
 
 # The following expression selects the first bridge listed by 'brctl show'.
 # Modify it to suit your needs.
-switch=$(/usr/sbin/brctl show | awk 'NR==2 { print $1 }')
+switch=$(brctl show | awk 'NR==2 { print $1 }')
 
-/bin/echo 1 > /proc/sys/net/ipv6/conf/${switch}/disable_ipv6
-/sbin/ifconfig $1 0.0.0.0 up
-/usr/sbin/brctl addif ${switch} $1
-/usr/sbin/brctl setfd ${switch} 0
-/usr/sbin/brctl stp ${switch} off
+echo 1 > /proc/sys/net/ipv6/conf/${switch}/disable_ipv6
+ifconfig $1 0.0.0.0 up
+brctl addif ${switch} $1
+brctl setfd ${switch} 0
+brctl stp ${switch} off
diff --git a/client/tests/kvm/scripts/qemu-ifup-ipv6 b/client/tests/kvm/scripts/qemu-ifup-ipv6
index d4b0592..a11c084 100755
--- a/client/tests/kvm/scripts/qemu-ifup-ipv6
+++ b/client/tests/kvm/scripts/qemu-ifup-ipv6
@@ -2,10 +2,10 @@ 
 
 # The following expression selects the first bridge listed by 'brctl show'.
 # Modify it to suit your needs.
-switch=$(/usr/sbin/brctl show | awk 'NR==2 { print $1 }')
+switch=$(brctl show | awk 'NR==2 { print $1 }')
 
-/bin/echo 0 > /proc/sys/net/ipv6/conf/${switch}/disable_ipv6 
-/sbin/ifconfig $1 0.0.0.0 up
-/usr/sbin/brctl addif ${switch} $1
-/usr/sbin/brctl setfd ${switch} 0
-/usr/sbin/brctl stp ${switch} off
+echo 0 > /proc/sys/net/ipv6/conf/${switch}/disable_ipv6
+ifconfig $1 0.0.0.0 up
+brctl addif ${switch} $1
+brctl setfd ${switch} 0
+brctl stp ${switch} off