Added recent changes to core29.

diff --git a/config/rootfiles/core/29/filelists/files b/config/rootfiles/core/29/filelists/files
index f2876f589309ebca211f44bf450f046d7f4172bb..c7b879735df2aaa4a5a8beadad70c978ecfcaa48 100644 (file)
--- a/config/rootfiles/core/29/filelists/files
+++ b/config/rootfiles/core/29/filelists/files
@@ -1,3 +1,5 @@
+etc/collectd.conf
 etc/system-release
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
+var/ipfire/menu.d/50-firewall.menu

diff --git a/config/rootfiles/core/29/update.sh b/config/rootfiles/core/29/update.sh
index 4cf08abc3f1e3dd851fdebc6797f62b12bffc1ff..e5efad34771f42292f83809ad96f138f1a2c3e67 100644 (file)
--- a/config/rootfiles/core/29/update.sh
+++ b/config/rootfiles/core/29/update.sh
@@ -23,5 +23,8 @@
 #
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
+/etc/init.d/collectd stop
 ecxtract_files
+rm -rf /var/log/rrd*//collectd/localhost/disk-*[0-9]*
+/etc/init.d/collectd start
 #perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 4d16cf7d8f23fa95b1027c79cbea981905ab67eb..77c1dbde99736a6d48ab512e95457e467f7b1fb5 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -274,7 +274,6 @@
 * rssdler-0.4.0a
 * rsync-3.0.6
 * rtorrent-0.8.4
-* samba-3.3.5
 * samba-3.3.6
 * sane-1.0.19
 * screen-4.0.3