From: Christian Schmidt <maniacikarus@ipfire.org>
Date: Thu, 2 Jul 2009 15:29:51 +0000 (+0200)
Subject: Added recent changes to core29.
X-Git-Tag: v2.5-core29~57^2
X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=78dba03bc9899f5bf2f8ee069f1f5eab1512ac7f

Added recent changes to core29.
---

diff --git a/config/rootfiles/core/29/filelists/files b/config/rootfiles/core/29/filelists/files
index f2876f5893..c7b879735d 100644
--- 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 4cf08abc3f..e5efad3477 100644
--- 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 4d16cf7d8f..77c1dbde99 100644
--- 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