Core Update 172: Ship and restart OpenSSH

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

diff --git a/config/rootfiles/core/172/filelists/openssh b/config/rootfiles/core/172/filelists/openssh
new file mode 120000 (symlink)
index 0000000..d8c77fd
--- /dev/null
+++ b/config/rootfiles/core/172/filelists/openssh
@@ -0,0 +1 @@
+../../../common/openssh
\ No newline at end of file

diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/core/172/update.sh
index 89c34ffd7a73e4655a0fac220710f61f99dbc4e7..cd1cda5e2c2dc43536db03d304a25bb8c4169443 100644 (file)
--- a/config/rootfiles/core/172/update.sh
+++ b/config/rootfiles/core/172/update.sh
@@ -33,6 +33,7 @@ done
 
 # Stop services
 /etc/rc.d/init.d/ipsec stop
+/etc/rc.d/init.d/sshd stop
 
 # Remove files
 
@@ -48,7 +49,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
 if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
        /etc/init.d/ipsec start
 fi