]> gitweb.fluxo.info Git - kvm-manager.git/commitdiff
allow down() script to complete even with errors
authorJamie McClelland <jm@mayfirst.org>
Thu, 11 Feb 2016 17:23:27 +0000 (12:23 -0500)
committerDaniel Kahn Gillmor <dkg@fifthhorseman.net>
Mon, 6 Jun 2016 18:34:23 +0000 (14:34 -0400)
otherwise it is impossible to fully de-configure a guest
that has been partially de-configured (e.g. it has been killed).

kvm-manager

index e14df40f698f2271e36960bd409f2505e8699e32..1bdf74fa34871c8e7042e41b144654ed0791eb7f 100755 (executable)
@@ -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.
 }