Some little core fixes

git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1196 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

config/collectd/collectd.conf

@@ -105,6 +105,8 @@ LoadPlugin syslog
 	Chain filter PSCAN DROP_PScan
 	Chain filter NEWNOTSYN DROP_NEWNOTSYN
 	Chain filter OUTGOINGFW DROP_OUTGOINGFW
+	Chain filter INPUT DROP_Wirelessinput
+	Chain filter FORWARD DROP_Wirelessforward
 </Plugin>
 
 #<Plugin irq>

config/rootfiles/core/7/files

@@ -19,4 +19,4 @@ var/ipfire/graphs.pl
 var/ipfire/menu.d/20-status.menu
 var/ipfire/langs
 lib/modules/2.6.16.57-ipfire/kernel/drivers/ieee1394/sbp2.ko
-html/cgi-bin/logs.cgi/log.dat
+srv/web/ipfire/cgi-bin/logs.cgi/log.dat

html/cgi-bin/logs.cgi/log.dat

@@ -57,7 +57,7 @@ my %sections = (
         'red' => '(red:|pppd\[.*\]: |chat\[.*\]|pppoe\[.*\]|pptp\[.*\]|pppoa\[.*\]|pppoa3\[.*\]|pppoeci\[.*\]|ipppd|ipppd\[.*\]|kernel: ippp\d|kernel: isdn.*|ibod\[.*\]|dhcpcd\[.*\]|modem_run\[.*\])',
         'dns' => '(dnsmasq\[.*\]: )',
         'dhcp' => '(dhcpd: )',
-        'collectd' => '(collectd: )',
+        'collectd' => '(collectd\[.*\]: )',
         'cron' => '(fcron\[.*\]: )',
         'ntp' => '(ntpd(?:ate)?\[.*\]: )',
         'ssh' => '(sshd(?:\(.*\))?\[.*\]: )',