From: Arne Fitzenreiter Date: Sat, 22 Jan 2011 17:54:31 +0000 (+0100) Subject: remove more bogus logentries. X-Git-Tag: v2.9-core45~1^2~18 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=324bb8881f2e21a483d0d8495564be240af33b66 remove more bogus logentries. --- diff --git a/config/rootfiles/core/45/filelists/files b/config/rootfiles/core/45/filelists/files index ae685d5382..03e511f495 100644 --- a/config/rootfiles/core/45/filelists/files +++ b/config/rootfiles/core/45/filelists/files @@ -1,11 +1,17 @@ etc/system-release etc/issue +etc/rc.d/init.d/functions srv/web/ipfire/cgi-bin/connections.cgi +srv/web/ipfire/cgi-bin/fireinfo.cgi +srv/web/ipfire/cgi-bin/ids.cgi srv/web/ipfire/cgi-bin/index.cgi +srv/web/ipfire/cgi-bin/pakfire.cgi srv/web/ipfire/cgi-bin/pppsetup.cgi srv/web/ipfire/cgi-bin/proxy.cgi srv/web/ipfire/cgi-bin/vpnmain.cgi usr/sbin/updxlrator var/ipfire/outgoing/bin/outgoingfw.pl srv/web/ipfire/cgi-bin/logs.cgi/firewalllog.dat +usr/local/bin/makegraphs +usr/local/bin/hddshutdown usr/local/bin/vpn-watch diff --git a/html/cgi-bin/fireinfo.cgi b/html/cgi-bin/fireinfo.cgi index 1be0ebe338..11c4637d69 100644 --- a/html/cgi-bin/fireinfo.cgi +++ b/html/cgi-bin/fireinfo.cgi @@ -152,7 +152,7 @@ print < -   +   diff --git a/html/cgi-bin/ids.cgi b/html/cgi-bin/ids.cgi index 7567fd06e5..734e7dc886 100644 --- a/html/cgi-bin/ids.cgi +++ b/html/cgi-bin/ids.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPFire Team # +# Copyright (C) 2005-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -97,7 +97,7 @@ if (-e "/etc/snort/snort.conf") { close(FILE); open(FILE, ">/etc/snort/snort.conf") or die 'Unable to write snort config file.'; - my @rules = `cd /etc/snort/rules/ && ls *.rules`; # With this loop the rule might be display with correct rulepath set + my @rules = `cd /etc/snort/rules/ && ls *.rules 2>/dev/null`; # With this loop the rule might be display with correct rulepath set foreach (@rules) { chomp $_; my $temp = join(";",@snortconfig); diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi index da761f085e..124f912cf7 100644 --- a/html/cgi-bin/pakfire.cgi +++ b/html/cgi-bin/pakfire.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# Copyright (C) 2007-2011 Michael Tremer & Christian Schmidt # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -57,12 +57,6 @@ sub refreshpage{&Header::openbox( 'Waiting', 1, "/dev/null`) { - $reboot = 1; -} - if ($pakfiresettings{'ACTION'} eq 'install'){ $pakfiresettings{'INSPAKS'} =~ s/\|/\ /g; if ("$pakfiresettings{'FORCE'}" eq "on") { @@ -236,7 +230,7 @@ my $packages_update_age = &General::age("/opt/pakfire/db/lists/packages_list.db" print < END -if ($reboot == 1) { +if ( -e "/var/run/need_reboot") { print "$Lang::tr{'needreboot'}!"; print " " } diff --git a/html/cgi-bin/wlanap.cgi b/html/cgi-bin/wlanap.cgi index cd5bda3e87..0bb42ae312 100644 --- a/html/cgi-bin/wlanap.cgi +++ b/html/cgi-bin/wlanap.cgi @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2005-2010 IPTifre Team # +# Copyright (C) 2005-2011 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -242,7 +242,7 @@ $selected{'TXPOWER'}{$wlanapsettings{'TXPOWER'}} = "selected='selected'"; $selected{'HW_MODE'}{$wlanapsettings{'HW_MODE'}} = "selected='selected'"; $selected{'MACMODE'}{$wlanapsettings{'MACMODE'}} = "selected='selected'"; -my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel`; +my @channellist_cmd = `iwlist $wlanapsettings{'INTERFACE'} channel 2>/dev/null`; # get available channels my @temp; @@ -253,7 +253,7 @@ if ( $channel =~ /\d+/ ){push(@temp,$channel);} } my @channellist = @temp; -my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower`; +my @txpower_cmd = `iwlist $wlanapsettings{'INTERFACE'} txpower 2>/dev/null`; # get available channels my @temp; diff --git a/src/initscripts/init.d/functions b/src/initscripts/init.d/functions index 00cd6fa2a1..e2e058d38b 100644 --- a/src/initscripts/init.d/functions +++ b/src/initscripts/init.d/functions @@ -27,7 +27,7 @@ KILLDELAY="10" ## Screen Dimensions # Find current screen size if [ -z "${COLUMNS}" ]; then - COLUMNS=$(stty size) + COLUMNS=$(stty size 2>/dev/null) COLUMNS=${COLUMNS##* } fi diff --git a/src/scripts/hddshutdown b/src/scripts/hddshutdown index 28994998bd..bb28f830a7 100644 --- a/src/scripts/hddshutdown +++ b/src/scripts/hddshutdown @@ -1,13 +1,26 @@ #!/usr/bin/perl +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2011 IPFire Team # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see . # +# # +############################################################################### # # IPFire HDD Shutdown state reader # -# This code is distributed under the terms of the GPL -# -# 18.09.2007 Maniacikarus - IPFire.org - maniacikarus@ipfire.org -# 22.09.2007 Arne_F - fitzenreiter.de - arne@fitzenreiter.de - -# begin my @devices = `kudzu -qps -c HD | grep device: | cut -d" " -f2 | sort | uniq`; my $diskstats = ""; @@ -20,7 +33,7 @@ if ($debug){print "### Searching for available Disks ###\n";} foreach (@devices){ chomp $_; my @array = split(/\//,$_); - $diskstats = `cat /var/run/hddstats-$array[$#array]`; + $diskstats = `cat /var/run/hddstats-$array[$#array] 2>/dev/null`; chomp $diskstats; $newdiskstats = `iostat -d -t $_ | tail -2 | head -1 | awk '{ print \$5","\$6}'`; chomp $newdiskstats;