Merge branch 'stable-2.9' into master

[ganeti-local] / tools / kvm-console-wrapper

diff --git a/tools/kvm-console-wrapper b/tools/kvm-console-wrapper
index 757abff..7e65566 100755 (executable)
--- a/tools/kvm-console-wrapper
+++ b/tools/kvm-console-wrapper
@@ -1,4 +1,5 @@
 #!/bin/bash
+#
 
 # Copyright (C) 2011 Google Inc.
 #
@@ -17,8 +18,8 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 # 02110-1301, USA.
 
-INSTANCE="$1"
-SOCAT="$2"
+SOCAT="$1"
+INSTANCE="$2"
 MONITOR="$3"
 PARAMS="$4"
 CONSOLE="$5"
@@ -39,4 +40,4 @@ unpause() {
 }
 
 unpause &
-"$SOCAT" "$PARAMS" "$CONSOLE"
+exec "$SOCAT" "$PARAMS" "$CONSOLE"