core202: Ship sysklogd again

Since this was a last-minute change in c201, we should ship it all
again.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/config/rootfiles/core/202/filelists/files b/config/rootfiles/core/202/filelists/files
index 67fc81b91841312c63d2c463bcae9b9fb43320e4..bafa3c6481694cd76e6dfa7cdb29e622ea9af898 100644 (file)
--- a/config/rootfiles/core/202/filelists/files
+++ b/config/rootfiles/core/202/filelists/files
@@ -1,4 +1,6 @@
 etc/rc.d/init.d/firewall
+etc/rc.d/init.d/sysklogd
 srv/web/ipfire/cgi-bin/ids.cgi
+srv/web/ipfire/cgi-bin/services.cgi
 var/ipfire/dns/dnsbl.json
 var/spool/cron/root.orig

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

diff --git a/config/rootfiles/core/202/update.sh b/config/rootfiles/core/202/update.sh
index 51eb36a583844435e19cf3b7ea30033f35aab4d0..0acea254904d972d337114a9a61ad79da6224423 100644 (file)
--- a/config/rootfiles/core/202/update.sh
+++ b/config/rootfiles/core/202/update.sh
@@ -55,6 +55,11 @@ if ! getent passwd unbound >/dev/null; then
 fi
 
 # Remove files
+rm -vf \
+       /usr/sbin/klogd
+
+# Terminate the kernel logger
+killall klogd
 
 # Extract files
 extract_files
@@ -78,6 +83,7 @@ chown unbound:unbound -Rv /var/lib/unbound/ /var/cache/unbound/
 /usr/local/bin/sshctrl
 
 # Start services
+/etc/init.d/sysklogd restart
 /etc/init.d/firewall restart
 /etc/init.d/suricata restart
 /etc/init.d/unbound restart