[Ipcop-svn] SF.net SVN: ipcop:[5806] ipcop/trunk

[owes]

Revision: 5806
          http://ipcop.svn.sourceforge.net/ipcop/?rev=5806&view=rev
Author:   owes
Date:     2011-08-18 12:03:13 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
Add rrdtool so we can fix SF #3000712 without the need for deleting existing 
RRD files.

Modified Paths:
--------------
    ipcop/trunk/config/rootfiles/common/rrdtool
    ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
    ipcop/trunk/updates/1.9.20/information.xml
    ipcop/trunk/updates/1.9.20/setup

Modified: ipcop/trunk/config/rootfiles/common/rrdtool
===================================================================
--- ipcop/trunk/config/rootfiles/common/rrdtool 2011-08-18 09:53:41 UTC (rev 
5805)
+++ ipcop/trunk/config/rootfiles/common/rrdtool 2011-08-18 12:03:13 UTC (rev 
5806)
@@ -2,7 +2,7 @@
 ##
 #usr/bin/rrdcached
 #usr/bin/rrdcgi
-#usr/bin/rrdtool
+usr/bin/rrdtool
 #usr/bin/rrdupdate
 #usr/lib/librrd.la
 usr/lib/librrd.so

Modified: ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20
===================================================================
--- ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20    2011-08-18 09:53:41 UTC 
(rev 5805)
+++ ipcop/trunk/updates/1.9.20/ROOTFILES.i486-1.9.20    2011-08-18 12:03:13 UTC 
(rev 5806)
@@ -392,6 +392,9 @@
 /usr/bin/vmstat
 /usr/bin/w
 ##
+## rrd-1.4.5 add rrdtool
+/usr/bin/rrdtool
+##
 ## squid-3.1.14
 /usr/lib/squid/diskd
 /usr/lib/squid/msnt_auth

Modified: ipcop/trunk/updates/1.9.20/information.xml
===================================================================
--- ipcop/trunk/updates/1.9.20/information.xml  2011-08-18 09:53:41 UTC (rev 
5805)
+++ ipcop/trunk/updates/1.9.20/information.xml  2011-08-18 12:03:13 UTC (rev 
5806)
@@ -4,9 +4,7 @@
         <releasedate>2011-06-dd</releasedate>
         <size>0</size>
         <description>Language updates.&lt;br /&gt;
-        Fix SF 3000712 - Spike in Traffic graphs after reboot.
-        Fix will only apply to upgrades if existing /var/log/rrd/ interface 
-        database files are deleted, to allow creation of new RRDs.&lt;br /&gt;
+        Fix SF 3000712 - Spike in Traffic graphs after reboot.&lt;br /&gt;
         Upgrade acpid to 2.0.9, apache httpd to 2.2.19, bash to 4.2.10, bind 
to 9.7.3-P1, coreutils to 8.12,
         dejavu-fonts to 2.33, dhcpcd to 5.2.12, freetype to 2.4.6, gawk to 
4.0.0, grep to 2.9,
         hdparm to 9.37, iproute2 to 2.6.39, iptables to 1.4.12, iptstate to 
2.2.3, iw to 0.9.22, kernel to 2.6.32.45,

Modified: ipcop/trunk/updates/1.9.20/setup
===================================================================
--- ipcop/trunk/updates/1.9.20/setup    2011-08-18 09:53:41 UTC (rev 5805)
+++ ipcop/trunk/updates/1.9.20/setup    2011-08-18 12:03:13 UTC (rev 5806)
@@ -89,6 +89,14 @@
 #
 #####
 
+# Fix SF 3000712 - Spike in traffic graphs after reboot
+for INTERFACE in GREEN_1 BLUE_1 ORANGE_1 RED_1 ppp0; do
+    if [ -f /var/log/rrd/${INTERFACE}.rrd ]; then
+        /usr/bin/rrdtool tune /var/log/rrd/${INTERFACE}.rrd --data-source-type 
incoming:DERIVE
+        /usr/bin/rrdtool tune /var/log/rrd/${INTERFACE}.rrd --data-source-type 
outgoing:DERIVE
+    fi
+done
+
 # restart squid (helper checks whether squid is enabled)
 /usr/local/bin/restartsquid
 


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system, 
user administration capabilities and model configuration. Take 
the hassle out of deploying and managing Subversion and the 
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Ipcop-svn mailing list
Ipcop-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/ipcop-svn