Fix low verbosity levels in htools

[ganeti-local] / tools / kvm-ifup.in

diff --git a/tools/kvm-ifup.in b/tools/kvm-ifup.in
index e567f12..e506d73 100644 (file)
--- a/tools/kvm-ifup.in
+++ b/tools/kvm-ifup.in
@@ -18,6 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
+@SHELL_ENV_INIT@
+
 if [ -z "$INTERFACE" ]; then
   echo "No network interface specified"
   exit 1
@@ -29,8 +31,8 @@ if [ -z "$MODE" ]; then
 fi
 
 # Execute the user-supplied network script, if applicable
-if [ -x "@SYSCONFDIR@/ganeti/kvm-vif-bridge" ]; then
-  exec @SYSCONFDIR@/ganeti/kvm-vif-bridge
+if [ -x "$CONF_DIR/kvm-vif-bridge" ]; then
+  exec $CONF_DIR/kvm-vif-bridge
 fi
 
 if [ "$MODE" = "bridged" ]; then
@@ -45,6 +47,10 @@ if [ "$MODE" = "bridged" ]; then
 
   # Connect the interface to the bridge
   brctl addif $BRIDGE $INTERFACE
+
+elif [ "$MODE" = "openvswitch" ]; then
+  ovs-vsctl add-port ${LINK} $INTERFACE
+
 else
   ip link set $INTERFACE up
 
@@ -63,6 +69,7 @@ else
     ip route replace $IP proto static dev $INTERFACE
   fi
 
+  # Allow routing and arp proxying, or ndp proxying (IPv6)
   if [ -d "/proc/sys/net/ipv4/conf/$INTERFACE" ]; then
     echo 1 > /proc/sys/net/ipv4/conf/$INTERFACE/proxy_arp
     echo 1 > /proc/sys/net/ipv4/conf/$INTERFACE/forwarding