Accepting request 266548 from Virtualization
1 OBS-URL: https://build.opensuse.org/request/show/266548 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/libvirt?expand=0&rev=168
This commit is contained in:
commit
ce74241db6
@ -74,7 +74,7 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
|
||||
return 1
|
||||
else
|
||||
return 0
|
||||
@@ -83,6 +84,25 @@ run_virsh_c() {
|
||||
@@ -83,6 +84,26 @@ run_virsh_c() {
|
||||
( export LC_ALL=C; run_virsh "$@" )
|
||||
}
|
||||
|
||||
@ -91,8 +91,9 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
|
||||
+ run_virsh $uri list > /dev/null 2>&1
|
||||
+ done
|
||||
+ if [ $i -eq $rets ]; then
|
||||
+ echo $"libvirt-guests unable to connect to URI: $uri"
|
||||
+ return 1
|
||||
+ eval_gettext "libvirt-guests unable to connect to URI: $uri"
|
||||
+ echo
|
||||
+ return 1
|
||||
+ fi
|
||||
+ return 0
|
||||
+}
|
||||
@ -118,13 +119,14 @@ Index: libvirt-1.2.10/tools/libvirt-guests.sh.in
|
||||
return 1
|
||||
fi
|
||||
|
||||
@@ -190,6 +210,12 @@ start() {
|
||||
@@ -190,6 +210,13 @@ start() {
|
||||
|
||||
test_connect "$uri" || continue
|
||||
|
||||
+ await_daemon_up $uri
|
||||
+ if [ $? -ne 0 ]; then
|
||||
+ echo $"Ignoring guests on $uri URI, can't connect"
|
||||
+ eval_gettext "Ignoring guests on $uri URI, can't connect"
|
||||
+ echo
|
||||
+ continue
|
||||
+ fi
|
||||
+
|
||||
|
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sat Dec 27 22:08:00 UTC 2014 - Led <ledest@gmail.com>
|
||||
|
||||
- fix bashisms in libvirt-guests.sh script
|
||||
- update patches:
|
||||
+ libvirt-guests-init-script.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 15 09:48:02 UTC 2014 - cbosdonnat@suse.com
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user