From b7ad479c3e64fdb62ce005a1ca439476883e67a5 Mon Sep 17 00:00:00 2001
From: bencoh <bencoh@19625182-23af-4830-9084-f181c60b83b7>
Date: Wed, 14 Jul 2010 15:45:14 +0000
Subject: Remove kvm-net.conf, move bridge definition to kvm-wrapper.conf.
 Export KVM_BRIDGE in kvm-wrapper.sh so that kvm-ifup/down can use it (thus
 removing the need for a pair of scrips per bridge).

git-svn-id: https://svn.notk.org/bencoh/kvm-wrapper/@12 19625182-23af-4830-9084-f181c60b83b7
---
 net/kvm-ifup | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'net/kvm-ifup')

diff --git a/net/kvm-ifup b/net/kvm-ifup
index 87e105e..53c5c3d 100755
--- a/net/kvm-ifup
+++ b/net/kvm-ifup
@@ -1,18 +1,10 @@
 #!/bin/sh
-
-# Debian default
-#switch=$(ip route ls | awk '/^default / { for(i=0;i<NF;i++) { if ($(i) == "dev") print $(i+1) }}')
-#/sbin/ifconfig $1 0.0.0.0 up
-#/usr/sbin/brctl addif ${switch} $1
-#exit 0
-
-
-# Configuration with NAT support
-
-. /usr/share/kvm-wrapper/net/kvm-net.conf
+#
+# Script called by kvm on tap interface creation
+#
 
 echo "$0:"
-echo "Adding $1 to bridge interface $BRIDGE"
-brctl addif "$BRIDGE" "$1"
+echo "Adding $1 to bridge interface $KVM_BRIDGE"
+brctl addif "$KVM_BRIDGE" "$1"
 ip link set "$1" up
 
-- 
cgit v1.2.3-70-g09d2