[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, master, updated. debian/0.7.5-3

[Guido Günther]

The following commit has been merged in the master branch:
commit c3c84f6b7891db2abe53b29168081c8a7739062e
Author: Guido Günther <agx at sigxcpu.org>
Date:   Fri Jan 8 11:07:01 2010 +0100

    Terminate nc on EOF
    
    Closes: #564053
    Thanks: Gabor Gombas for the patch

diff --git a/debian/patches/0006-Terminate-nc-on-EOF.patch b/debian/patches/0006-Terminate-nc-on-EOF.patch
new file mode 100644
index 0000000..6fa72a4
--- /dev/null
+++ b/debian/patches/0006-Terminate-nc-on-EOF.patch
@@ -0,0 +1,32 @@
+From: Gabor Gombas <gombasg at sztaki.hu>
+Date: Fri, 8 Jan 2010 11:00:07 +0100
+Subject: [PATCH] Terminate nc on EOF
+
+Closes: #564053
+---
+ src/remote/remote_driver.c |    4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/src/remote/remote_driver.c b/src/remote/remote_driver.c
+index d6f5fce..a4055f8 100644
+--- a/src/remote/remote_driver.c
++++ b/src/remote/remote_driver.c
+@@ -730,7 +730,7 @@ doRemoteOpen (virConnectPtr conn,
+     }
+ 
+     case trans_ssh: {
+-        int j, nr_args = 6;
++        int j, nr_args = 8;
+ 
+         if (username) nr_args += 2; /* For -l username */
+         if (no_tty) nr_args += 5;   /* For -T -o BatchMode=yes -e none */
+@@ -764,6 +764,8 @@ doRemoteOpen (virConnectPtr conn,
+         }
+         cmd_argv[j++] = strdup (priv->hostname);
+         cmd_argv[j++] = strdup (netcat ? netcat : "nc");
++        cmd_argv[j++] = strdup ("-q");
++        cmd_argv[j++] = strdup ("0");
+         cmd_argv[j++] = strdup ("-U");
+         cmd_argv[j++] = strdup (sockname ? sockname :
+                                 (flags & VIR_CONNECT_RO
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index 72f2b02..aa4a9bd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 0003-allow-libvirt-group-to-access-the-socket.patch
 0004-fix-Debian-specific-path-to-hvm-loader.patch
 0005-Also-look-for-dmi-information-in-sys-class.patch
+0006-Terminate-nc-on-EOF.patch

-- 
Libvirt Debian packaging