Attachment 1456063 Details for Bug 1597420 – Fixes the problem by renaming guests to guests_to_shutdown in the parallel shutdown function.

[patch] Fixes the problem by renaming guests to guests_to_shutdown in the parallel shutdown function.

libvirt-guests.sh.patch (text/plain), 1.22 KB, created by Philippe Troin on 2018-07-02 22:04:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Philippe Troin

Created: 2018-07-02 22:04:23 UTC

Size: 1.22 KB

patch

obsolete

>--- /etc/CONFIG/orig/usr/libexec/libvirt-guests.sh	2018-06-18 11:11:16.000000000 -0700
>+++ /usr/libexec/libvirt-guests.sh	2018-07-02 13:14:51.187456961 -0700
>@@ -373,7 +373,7 @@
> shutdown_guests_parallel()
> {
>     uri=$1
>-    guests=$2
>+    guests_to_shutdown=$2
> 
>     on_shutdown=
>     check_timeout=false
>@@ -385,13 +385,13 @@
>         slept=0
>         format=$(eval_gettext "Waiting for %d guests to shut down\n")
>     fi
>-    while [ -n "$on_shutdown" ] || [ -n "$guests" ]; do
>-        while [ -n "$guests" ] &&
>+    while [ -n "$on_shutdown" ] || [ -n "$guests_to_shutdown" ]; do
>+        while [ -n "$guests_to_shutdown" ] &&
>               [ $(guest_count "$on_shutdown") -lt "$PARALLEL_SHUTDOWN" ]; do
>-            set -- $guests
>+            set -- $guests_to_shutdown
>             guest=$1
>             shift
>-            guests=$*
>+            guests_to_shutdown=$*
>             if [ -z "$(echo $on_shutdown | grep $guest)" ] &&
>                [ -n "$(guest_name "$uri" "$guest")" ]; then
>                 shutdown_guest_async "$uri" "$guest"
>@@ -400,7 +400,7 @@
>         done
>         sleep 1
> 
>-        set -- $guests
>+        set -- $guests_to_shutdown
>         guestcount=$#
>         set -- $on_shutdown
>         shutdowncount=$#

Actions: View | Diff

Attachments on bug 1597420: 1456063