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 (symlink)
index 0000000..d8c77fd
--- /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 b5a914a9189258a04fd7458b1dc9e6a6ede3f48b..8ed5cd60d50ad1911ffbc33f28e43e095e28520f 100644 (file)
--- 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