From 58db297154212d0f39e69aad0753bf2f85c89327 Mon Sep 17 00:00:00 2001 From: Elliott Mitchell Date: Wed, 9 Dec 2020 14:39:07 -0800 Subject: [PATCH] debian/xendomains.init: Pipe xen-init-list instead of tmp file /usr/lib/xen-common/bin/xen-init-list can be piped to the loop, rather than creating a temporary file. This is also pure-Bourne shell syntax, rather than requiring Bash. Signed-off-by: Elliott Mitchell Acked-by: Hans van Kranenburg --- debian/xen-utils-common.xendomains.init | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/debian/xen-utils-common.xendomains.init b/debian/xen-utils-common.xendomains.init index ca03ae4cfe..907cc117be 100644 --- a/debian/xen-utils-common.xendomains.init +++ b/debian/xen-utils-common.xendomains.init @@ -153,10 +153,10 @@ do_stop_migrate() { [ -n "$XENDOMAINS_MIGRATE" ] || return - while read id name rest; do + /usr/lib/xen-common/bin/xen-init-list | while read id name discard; do log_action_begin_msg "Migrating Xen domain $name ($id)" (timeout_coproc "$XENDOMAINS_STOP_MAXWAIT" xen migrate $id $XENDOMAINS_MIGRATE) - done < <(/usr/lib/xen-common/bin/xen-init-list) + done } do_stop_save() @@ -164,24 +164,24 @@ do_stop_save() [ -n "$XENDOMAINS_SAVE" ] || return [ -d "$XENDOMAINS_SAVE" ] || mkdir -m 0700 -p "$XENDOMAINS_SAVE" - while read id name rest; do + /usr/lib/xen-common/bin/xen-init-list | while read id name discard; do log_action_begin_msg "Saving Xen domain $name ($id)" (timeout_coproc "$XENDOMAINS_STOP_MAXWAIT" xen save $id $XENDOMAINS_SAVE/$name) - done < <(/usr/lib/xen-common/bin/xen-init-list) + done } do_stop_shutdown() { - while read id name rest; do + /usr/lib/xen-common/bin/xen-init-list | while read id name discard; do log_action_begin_msg "Shutting down Xen domain $name ($id)" xen shutdown $id 2>&1 1>/dev/null log_action_end_msg $? - done < <(/usr/lib/xen-common/bin/xen-init-list) - while read id name rest; do + done + /usr/lib/xen-common/bin/xen-init-list | while read id name discard; do log_action_begin_msg "Waiting for Xen domain $name ($id) to shut down" timeout_domain "$name" "$XENDOMAINS_STOP_MAXWAIT" log_action_end_msg $? - done < <(/usr/lib/xen-common/bin/xen-init-list) + done } do_stop() -- 2.30.2