include/inst: Make instances trap signals

Instances don't handle signals, causing them not to get cleaned up
properly when terminated by a signal.
This commit adds a signal handler to the inst module, making sure
instances are properly cleaned up when terminated by a signal.

diff --git a/include/inst.sh b/include/inst.sh
index 677bb36015807bfe921c9941be4be3f7f2e88d5d..398da981ccff31f182f9b230709d2a3b2462f8ba 100644 (file)
--- a/include/inst.sh
+++ b/include/inst.sh
@@ -156,6 +156,14 @@ inst_running() {
        return 1
 }
 
+_inst_stop_self() {
+       if ! inst_stop "$BASHPID"; then
+               return 1
+       fi
+
+       return 0
+}
+
 _inst_run() {
        local cmd="$1"
        local args=("${@:2}")
@@ -179,6 +187,8 @@ _inst_run() {
                return 1
        fi
 
+       trap _inst_stop_self INT HUP TERM EXIT QUIT
+
        if ! "$cmd" "${args[@]}"; then
                ret=1
        else