From: Peter Müller <peter.mueller@ipfire.org>
Date: Tue, 18 Apr 2023 21:14:06 +0000 (+0000)
Subject: Core Update 175: Ship and restart OpenSSH
X-Git-Tag: v2.27-core175~190
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dc93dd9d19dadbb62dd40207f9ea3014fa56827a;p=ipfire-2.x.git

Core Update 175: Ship and restart OpenSSH

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---

diff --git a/config/rootfiles/core/175/filelists/openssh b/config/rootfiles/core/175/filelists/openssh
new file mode 120000
index 0000000000..d8c77fd8e7
--- /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 b5a914a918..8ed5cd60d5 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