From 235d5b22a8368aee4696b1b2c84d702bf326a084 Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Thu, 1 Sep 2016 09:56:42 +0200
Subject: T18: Regression: jessie-based VyOS doesn't disconnect the SSH session
 before reboot

---
 .../hooks/18-disable_services.chroot               | 27 ---------------------
 .../hooks/18-enable-disable_services.chroot        | 28 ++++++++++++++++++++++
 .../etc/systemd/system/sshd.service                | 16 -------------
 .../lib/systemd/system/ssh-session-cleanup.service | 13 ++++++++++
 .../usr/lib/openssh/ssh-session-cleanup            | 11 +++++++++
 5 files changed, 52 insertions(+), 43 deletions(-)
 delete mode 100755 data/live-build-config/hooks/18-disable_services.chroot
 create mode 100755 data/live-build-config/hooks/18-enable-disable_services.chroot
 delete mode 100644 data/live-build-config/includes.chroot/etc/systemd/system/sshd.service
 create mode 100755 data/live-build-config/includes.chroot/lib/systemd/system/ssh-session-cleanup.service
 create mode 100755 data/live-build-config/includes.chroot/usr/lib/openssh/ssh-session-cleanup

diff --git a/data/live-build-config/hooks/18-disable_services.chroot b/data/live-build-config/hooks/18-disable_services.chroot
deleted file mode 100755
index c68a6b3d..00000000
--- a/data/live-build-config/hooks/18-disable_services.chroot
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/sh
-
-echo I: Disabling services.
-systemctl disable exim4
-/usr/sbin/update-rc.d -f exim4 remove
-systemctl disable isc-dhcp-server
-/usr/sbin/update-rc.d -f isc-dhcp-server remove
-systemctl disable isc-dhcp-relay
-/usr/sbin/update-rc.d -f isc-dhcp-relay remove
-systemctl disable nfacctd
-/usr/sbin/update-rc.d -f nfacctd remove
-systemctl disable pmacctd
-/usr/sbin/update-rc.d -f pmacctd remove
-systemctl disable sfacctd
-/usr/sbin/update-rc.d -f sfacctd remove
-systemctl disable uacctd
-/usr/sbin/update-rc.d -f uacctd remove
-systemctl disable lighttpd
-/usr/sbin/update-rc.d -f lighttpd remove
-systemctl disable ssh
-/usr/sbin/update-rc.d -f ssh remove
-systemctl disable openvpn
-/usr/sbin/update-rc.d -f openvpn remove
-systemctl disable dnsmasq
-/usr/sbin/update-rc.d -f dnsmasq remove
-systemctl disable lldpd
-/usr/sbin/update-rc.d -f lldpd remove
diff --git a/data/live-build-config/hooks/18-enable-disable_services.chroot b/data/live-build-config/hooks/18-enable-disable_services.chroot
new file mode 100755
index 00000000..68971405
--- /dev/null
+++ b/data/live-build-config/hooks/18-enable-disable_services.chroot
@@ -0,0 +1,28 @@
+#!/bin/sh
+
+echo I: Enabling/Disabling services.
+systemctl disable exim4
+/usr/sbin/update-rc.d -f exim4 remove
+systemctl disable isc-dhcp-server
+/usr/sbin/update-rc.d -f isc-dhcp-server remove
+systemctl disable isc-dhcp-relay
+/usr/sbin/update-rc.d -f isc-dhcp-relay remove
+systemctl disable nfacctd
+/usr/sbin/update-rc.d -f nfacctd remove
+systemctl disable pmacctd
+/usr/sbin/update-rc.d -f pmacctd remove
+systemctl disable sfacctd
+/usr/sbin/update-rc.d -f sfacctd remove
+systemctl disable uacctd
+/usr/sbin/update-rc.d -f uacctd remove
+systemctl disable lighttpd
+/usr/sbin/update-rc.d -f lighttpd remove
+systemctl disable ssh
+/usr/sbin/update-rc.d -f ssh remove
+systemctl disable openvpn
+/usr/sbin/update-rc.d -f openvpn remove
+systemctl disable dnsmasq
+/usr/sbin/update-rc.d -f dnsmasq remove
+systemctl disable lldpd
+/usr/sbin/update-rc.d -f lldpd remove
+systemctl enable ssh-session-cleanup
diff --git a/data/live-build-config/includes.chroot/etc/systemd/system/sshd.service b/data/live-build-config/includes.chroot/etc/systemd/system/sshd.service
deleted file mode 100644
index e84142bb..00000000
--- a/data/live-build-config/includes.chroot/etc/systemd/system/sshd.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=OpenBSD Secure Shell server
-After=network.target auditd.service
-ConditionPathExists=!/etc/ssh/sshd_not_to_be_run
-
-[Service]
-EnvironmentFile=-/etc/default/ssh
-ExecStart=/usr/sbin/sshd -D $SSHD_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-ExecStop=/usr/bin/killall sshd
-KillMode=process
-Restart=on-failure
-
-[Install]
-WantedBy=multi-user.target
-Alias=sshd.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
new file mode 100755
index 00000000..b8672722
--- /dev/null
+++ b/data/live-build-config/includes.chroot/lib/systemd/system/ssh-session-cleanup.service
@@ -0,0 +1,13 @@
+[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
new file mode 100755
index 00000000..f283cc96
--- /dev/null
+++ b/data/live-build-config/includes.chroot/usr/lib/openssh/ssh-session-cleanup
@@ -0,0 +1,11 @@
+#! /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