fish: docs: note how to clean up the remote process properly.

Killing it is always a bad idea, because the qemu subprocess will be
left hanging around.  The best thing is to send the exit command.

This also makes the change to virt-sysprep.
This commit is contained in:
Richard W.M. Jones
2011-10-13 11:56:52 +01:00
parent baa1618e0f
commit 11be7d8eee
2 changed files with 10 additions and 9 deletions

View File

@@ -175,16 +175,16 @@ if [ -z "$GUESTFISH_PID" ]; then
exit 1
fi
# Helper.
gf="guestfish --remote --"
cleanup ()
{
kill $GUESTFISH_PID >/dev/null 2>&1 ||:
$gf exit >/dev/null 2>&1 ||:
rm -rf "$tmpdir" ||:
}
trap cleanup EXIT ERR
# Helper.
gf="guestfish --remote --"
# Launch back-end, inspect for operating systems, and get the guest
# root disk.
root=$($gf inspect-get-roots)

View File

@@ -996,14 +996,15 @@ and cleans up guestfish when the script exits:
exit 1
fi
kill_guestfish ()
cleanup_guestfish ()
{
kill $GUESTFISH_PID >/dev/null 2>&1 ||:
guestfish --remote -- exit >/dev/null 2>&1 ||:
}
trap kill_guestfish EXIT
trap cleanup_guestfish EXIT ERR
guestfish --remote run
# etc.
guestfish --remote -- run
# ...
=head2 REMOTE CONTROL RUN COMMAND HANGING