summaryrefslogtreecommitdiffstats
path: root/core/modules/remote-access
diff options
context:
space:
mode:
authorSimon Rettberg2021-03-05 14:44:09 +0100
committerSimon Rettberg2021-03-05 14:44:59 +0100
commitd4c29ec5bda488445b0180d3ac2623574d65854f (patch)
tree1861f2d73799fb907fb1de4f827d712991b78366 /core/modules/remote-access
parent[dnbd3] add build dependency to 'clang-format' (diff)
downloadmltk-d4c29ec5bda488445b0180d3ac2623574d65854f.tar.gz
mltk-d4c29ec5bda488445b0180d3ac2623574d65854f.tar.xz
mltk-d4c29ec5bda488445b0180d3ac2623574d65854f.zip
[remote-access] Handle INT TERM differently from EXIT
Trapping INT or TERM doesn't yield an implicit exit
Diffstat (limited to 'core/modules/remote-access')
-rwxr-xr-xcore/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver
index 4e58cc3b..01b8bade 100755
--- a/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver
+++ b/core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver
@@ -35,7 +35,8 @@
copy="$( mktemp )"
cat "$XAUTHORITY" > "$copy"
export XAUTHORITY="$copy"
- trap 'rm -f -- "$copy"' EXIT INT TERM
+ trap 'exit 1' INT TERM
+ trap 'rm -f -- "$copy"' EXIT
fi
fails=0
while true; do