New patch 0008-syntax-error-Bad-fd-number-when-stopping-libvirt-gue.patch
Laurent Léonard
13 years ago
| 0 | From: =?UTF-8?q?Laurent=20L=C3=A9onard?= <laurent@open-minds.org> | |
| 1 | Date: Sun, 5 Dec 2010 18:53:26 +0100 | |
| 2 | Subject: [PATCH] syntax error "Bad fd number" when stopping libvirt-guests | |
| 3 | ||
| 4 | When libvirt-guests is being stopped, I get the following message: | |
| 5 | $Running guests on default URI: test-vm | |
| 6 | $Suspending guests on default URI... | |
| 7 | $Suspending test-vm: /etc/init.d/libvirt-guests: 340: Syntax error: Bad fd | |
| 8 | number | |
| 9 | ||
| 10 | Origin: upstream, http://libvirt.org/git/?p=libvirt.git;a=commit;h=68e5e4672a39e5aff135a898b692a7c0fc4874b2 | |
| 11 | --- | |
| 12 | AUTHORS | 1 + | |
| 13 | tools/libvirt-guests.init.in | 2 +- | |
| 14 | 2 files changed, 2 insertions(+), 1 deletions(-) | |
| 15 | ||
| 16 | diff --git a/AUTHORS b/AUTHORS | |
| 17 | index 16c755d..3b5318a 100644 | |
| 18 | --- a/AUTHORS | |
| 19 | +++ b/AUTHORS | |
| 20 | @@ -136,6 +136,7 @@ Patches have also been contributed by: | |
| 21 | Osier Yang <jyang@redhat.com> | |
| 22 | Kamezawa Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com> | |
| 23 | Wen Congyang <wency@cn.fujitsu.com> | |
| 24 | + Laurent Léonard <laurent@open-minds.org> | |
| 25 | ||
| 26 | [....send patches to get your name here....] | |
| 27 | ||
| 28 | diff --git a/tools/libvirt-guests.init.in b/tools/libvirt-guests.init.in | |
| 29 | index 4e0682d..76dc627 100644 | |
| 30 | --- a/tools/libvirt-guests.init.in | |
| 31 | +++ b/tools/libvirt-guests.init.in | |
| 32 | @@ -177,7 +177,7 @@ suspend_guest() | |
| 33 | virsh_pid=$! | |
| 34 | while true; do | |
| 35 | sleep 1 | |
| 36 | - kill -0 $virsh_pid >&/dev/null || break | |
| 37 | + kill -0 $virsh_pid >/dev/null 2>&1 || break | |
| 38 | progress=$(run_virsh_c $uri domjobinfo $guest 2>/dev/null | \ | |
| 39 | awk '/^Data processed:/{print $3, $4}') | |
| 40 | if [ -n "$progress" ]; then | |
| 41 | -- |