From d4c29ec5bda488445b0180d3ac2623574d65854f Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Fri, 5 Mar 2021 14:44:09 +0100
Subject: [remote-access] Handle INT TERM differently from EXIT

Trapping INT or TERM doesn't yield an implicit exit
---
 core/modules/remote-access/data/etc/X11/Xsetup.d/50-launch-vncserver | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'core/modules/remote-access')

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
-- 
cgit v1.2.3-55-g7522