diff options
| author | Seth Mos <seth.mos@dds.nl> | 2011-03-09 12:50:05 +0100 |
|---|---|---|
| committer | Seth Mos <seth.mos@dds.nl> | 2011-03-09 12:50:05 +0100 |
| commit | 9c5ad16762b0922cc7224ef3b1531a778100551b (patch) | |
| tree | 15e16bd065c5cbb87e979afedf6b66057cbb5d1e /etc/inc/rrd.inc | |
| parent | 9956b38ae11ca0abd75a367f54009052a2126181 (diff) | |
| download | pfsense-9c5ad16762b0922cc7224ef3b1531a778100551b.zip pfsense-9c5ad16762b0922cc7224ef3b1531a778100551b.tar.gz | |
unbreak the broken merge
Diffstat (limited to 'etc/inc/rrd.inc')
| -rw-r--r-- | etc/inc/rrd.inc | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/etc/inc/rrd.inc b/etc/inc/rrd.inc index c5171fe..56d00fc 100644 --- a/etc/inc/rrd.inc +++ b/etc/inc/rrd.inc @@ -332,16 +332,8 @@ function enable_rrd_graphing() { $rrdupdatesh .= "\n"; $rrdupdatesh .= "# polling packets for interface $ifname $realif \n"; -<<<<<<< HEAD $rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$packets N:\\\n"; $rrdupdatesh .= "`$pfctl -vvsI -i {$realif} | awk '/In4\/Pass|Out4\/Pass|In6\/Pass|Out6\/Pass|In4\/Block|Out4\/Block|In6\/Block|Out6\/Block/ {printf \$4 \":\"}'|sed -e 's/.\$//'`\n"; -======= - $rrdupdatesh .= "unset PACKETS \n"; - $rrdupdatesh .= "PACKETS=`cat \$TMPFILE | awk '/In4\/Pass|Out4\/Pass/ {printf \$4 \":\"}'`\\\n"; - $rrdupdatesh .= "`cat \$TMPFILE | awk '/In4\/Block|Out4\/Block/ {printf \$4 \":\"}'|sed -e 's/.\$//'`\n"; - $rrdupdatesh .= "$rrdtool update $rrddbpath$ifname$packets N:\$PACKETS\n"; - $rrdupdatesh .= "rm \$TMPFILE \n"; ->>>>>>> upstream/master /* WIRELESS, set up the rrd file */ if($config['interfaces'][$ifname]['wireless']['mode'] == "bss") { |
