From 10b5c5bc93f5d9bb99c5523f41a97d49a833a453 Mon Sep 17 00:00:00 2001
From: Indrajit Raychaudhuri <irc@indrajit.com>
Date: Wed, 20 Dec 2023 01:18:26 -0600
Subject: ssh: T5841: Remove ssh-session-cleanup.service

With libpam-systemd >= 230-2, ssh-session-cleanup.service is no longer
necessary because when `UsePAM yes` in `/etc/ssh/sshd_config` (which is
the default), SSH sessions are cleaned up automatically when ssh-server
is shutdown or the system is rebooted.
---
 .../hooks/live/18-enable-disable_services.chroot            |  1 -
 .../lib/systemd/system/ssh-session-cleanup.service          | 13 -------------
 .../includes.chroot/usr/lib/openssh/ssh-session-cleanup     | 11 -----------
 3 files changed, 25 deletions(-)
 delete mode 100644 data/live-build-config/includes.chroot/lib/systemd/system/ssh-session-cleanup.service
 delete mode 100755 data/live-build-config/includes.chroot/usr/lib/openssh/ssh-session-cleanup

diff --git a/data/live-build-config/hooks/live/18-enable-disable_services.chroot b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
index 4dc880ca..08404a62 100755
--- a/data/live-build-config/hooks/live/18-enable-disable_services.chroot
+++ b/data/live-build-config/hooks/live/18-enable-disable_services.chroot
@@ -76,7 +76,6 @@ systemctl disable dpkg-db-backup.service
 systemctl disable zabbix-agent2.service
 
 echo I: Enabling services
-systemctl enable ssh-session-cleanup.service
 systemctl enable vyos-hostsd.service
 systemctl enable acpid.service
 systemctl enable vyos-router.service
diff --git a/data/live-build-config/includes.chroot/lib/systemd/system/ssh-session-cleanup.service b/data/live-build-config/includes.chroot/lib/systemd/system/ssh-session-cleanup.service
deleted file mode 100644
index b8672722..00000000
--- a/data/live-build-config/includes.chroot/lib/systemd/system/ssh-session-cleanup.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=OpenBSD Secure Shell session cleanup
-Wants=network.target
-After=network.target
-
-[Service]
-ExecStart=/bin/true
-ExecStop=/usr/lib/openssh/ssh-session-cleanup
-RemainAfterExit=yes
-Type=oneshot
-
-[Install]
-WantedBy=multi-user.target
diff --git a/data/live-build-config/includes.chroot/usr/lib/openssh/ssh-session-cleanup b/data/live-build-config/includes.chroot/usr/lib/openssh/ssh-session-cleanup
deleted file mode 100755
index f283cc96..00000000
--- a/data/live-build-config/includes.chroot/usr/lib/openssh/ssh-session-cleanup
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-
-ssh_session_pattern='sshd: \S.*@pts/[0-9]+'
-
-IFS="$IFS@"
-pgrep -a -f "$ssh_session_pattern" | while read pid daemon user pty; do
-	echo "Found ${daemon%:} session $pid on $pty; sending SIGTERM"
-	kill "$pid" || true
-done
-
-exit 0
-- 
cgit v1.2.3