diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:08:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:08:35 +0000 |
| commit | cbac459e6a1aa109776d996d85ebe31a72876e5c (patch) | |
| tree | 458dd3ab225cf9842526bd8f22f8a5872dc49506 /debian/patches/upstream-3823fa2c57.diff | |
| parent | Releasing progress-linux version 3.4-4~progress7.99u1. (diff) | |
| download | tmux-cbac459e6a1aa109776d996d85ebe31a72876e5c.tar.xz tmux-cbac459e6a1aa109776d996d85ebe31a72876e5c.zip | |
Merging debian version 3.4-5.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/upstream-3823fa2c57.diff')
| -rw-r--r-- | debian/patches/upstream-3823fa2c57.diff | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/debian/patches/upstream-3823fa2c57.diff b/debian/patches/upstream-3823fa2c57.diff new file mode 100644 index 0000000..09f6dc2 --- /dev/null +++ b/debian/patches/upstream-3823fa2c57.diff @@ -0,0 +1,29 @@ +commit 3823fa2c577d440649a84af660e4d3b0c095d248 +Author: Nicholas Marriott <nicholas.marriott@gmail.com> +Date: Tue Apr 30 12:38:58 2024 +0100 + + Send SIGHUP since some programs ignore SIGTERM, from Eduardo Grajeda in GitHub + issue 3958. + +diff --git a/compat/systemd.c b/compat/systemd.c +index 063474e3dd..bde372ccab 100644 +--- a/compat/systemd.c ++++ b/compat/systemd.c +@@ -144,6 +144,17 @@ systemd_move_pid_to_new_cgroup(pid_t pid, char **cause) + goto finish; + } + ++ /* ++ * Make sure that the session shells are terminated with SIGHUP since ++ * bash and friends tend to ignore SIGTERM. ++ */ ++ r = sd_bus_message_append(m, "(sv)", "SendSIGHUP", "b", 1); ++ if (r < 0) { ++ xasprintf(cause, "failed to append to properties: %s", ++ strerror(-r)); ++ goto finish; ++ } ++ + /* + * Inherit the slice from the parent process, or default to + * "app-tmux.slice" if that fails. |