[Pkg-libvirt-commits] [SCM] Libvirt Debian packaging branch, experimental, updated. debian/0.8.6-1-8-g6408c57

[Laurent Léonard]

The following commit has been merged in the experimental branch:
commit c8223b739177805f909b23da5f4358c71ba03af1
Author: Laurent Léonard <laurent at open-minds.org>
Date:   Thu Dec 9 22:34:43 2010 +0100

    New patch 0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch

diff --git a/debian/patches/0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch b/debian/patches/0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch
new file mode 100644
index 0000000..18bf0f7
--- /dev/null
+++ b/debian/patches/0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch
@@ -0,0 +1,42 @@
+From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent at open-minds.org>
+Date: Sun, 5 Dec 2010 18:53:26 +0100
+Subject: [PATCH] syntax error "Bad fd number" when stopping libvirt-guests
+
+When libvirt-guests is being stopped, I get the following message:
+$Running guests on default URI: test-vm
+$Suspending guests on default URI...
+$Suspending test-vm: /etc/init.d/libvirt-guests: 340: Syntax error: Bad fd
+number
+
+Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=68e5e4672a39e5aff135a898b692a7c0fc4874b2
+---
+ AUTHORS                      |    1 +
+ tools/libvirt-guests.init.in |    2 +-
+ 2 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/AUTHORS b/AUTHORS
+index 16c755d..3b5318a 100644
+--- a/AUTHORS
++++ b/AUTHORS
+@@ -136,6 +136,7 @@ Patches have also been contributed by:
+   Osier Yang           <jyang at redhat.com>
+   Kamezawa Hiroyuki    <kamezawa.hiroyu at jp.fujitsu.com>
+   Wen Congyang         <wency at cn.fujitsu.com>
++  Laurent Léonard      <laurent at open-minds.org>
+ 
+   [....send patches to get your name here....]
+ 
+diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in
+index 4e0682d..76dc627 100644
+--- a/tools/libvirt-guests.init.in
++++ b/tools/libvirt-guests.init.in
+@@ -177,7 +177,7 @@ suspend_guest()
+     virsh_pid=$!
+     while true; do
+         sleep 1
+-        kill -0 $virsh_pid >&/dev/null || break
++        kill -0 $virsh_pid >/dev/null 2>&1 || break
+         progress=$(run_virsh_c $uri domjobinfo $guest 2>/dev/null | \
+                    awk '/^Data processed:/{print $3, $4}')
+         if [ -n "$progress" ]; then
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index db58619..1967c45 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@
 0005-Autodetect-if-the-remote-nc-command-supports-the-q-o.patch
 0006-patch-qemuMonitorTextGetMigrationStatus-to-intercept.patch
 0007-Disable-CHECKSUM-rule.patch
+0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch

-- 
Libvirt Debian packaging