From dc93dd9d19dadbb62dd40207f9ea3014fa56827a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Peter=20M=C3=BCller?= <peter.mueller@ipfire.org>
Date: Tue, 18 Apr 2023 21:14:06 +0000
Subject: [PATCH] Core Update 175: Ship and restart OpenSSH
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 config/rootfiles/core/175/filelists/openssh | 1 +
 config/rootfiles/core/175/update.sh         | 7 +++++++
 2 files changed, 8 insertions(+)
 create mode 120000 config/rootfiles/core/175/filelists/openssh

diff --git a/config/rootfiles/core/175/filelists/openssh b/config/rootfiles/core/175/filelists/openssh
new file mode 120000
index 000000000..d8c77fd8e
--- /dev/null
+++ b/config/rootfiles/core/175/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/core/175/update.sh b/config/rootfiles/core/175/update.sh
index b5a914a91..8ed5cd60d 100644
--- a/config/rootfiles/core/175/update.sh
+++ b/config/rootfiles/core/175/update.sh
@@ -32,6 +32,7 @@ for (( i=1; i<=$core; i++ )); do
 done
 
 # Stop services
+/etc/rc.d/init.d/sshd stop
 
 # Extract files
 extract_files
@@ -55,7 +56,13 @@ ldconfig
 # Filesytem cleanup
 /usr/local/bin/filesystem-cleanup
 
+# Apply local configuration to sshd_config
+/usr/local/bin/sshctrl
+
 # Start services
+if grep -q "ENABLE_SSH=on" /var/ipfire/remote/settings; then
+	/etc/init.d/sshd start
+fi
 
 # This update needs a reboot...
 #touch /var/run/need_reboot