aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJamie McClelland <jm@mayfirst.org>2016-02-11 12:23:27 -0500
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>2016-06-06 14:34:23 -0400
commit45170872b1dadad2da90f690ac244d5a4846021f (patch)
tree19b33b0c9affb468d77ddb06362f4e4179b3ccf8
parentd8bd926096ecf6d8c38453b6752088b8a10ca3b7 (diff)
downloadkvm-manager-45170872b1dadad2da90f690ac244d5a4846021f.tar.gz
kvm-manager-45170872b1dadad2da90f690ac244d5a4846021f.tar.bz2
allow down() script to complete even with errors
otherwise it is impossible to fully de-configure a guest that has been partially de-configured (e.g. it has been killed).
-rwxr-xr-xkvm-manager2
1 files changed, 2 insertions, 0 deletions
diff --git a/kvm-manager b/kvm-manager
index e14df40..1bdf74f 100755
--- a/kvm-manager
+++ b/kvm-manager
@@ -137,9 +137,11 @@ EOF
}
down() {
+ set +e
brctl delif "$BRIDGE" "$TAP"
ip link set "$TAP" down
ip tuntap del mode tap dev "$TAP"
+ set -e
# no need to lock up the block device as well, since the owner might
# prefer to manipulate the disk directly.
}