From e4e74858e444e39320bddf402c1945242ffdb718 Mon Sep 17 00:00:00 2001 From: Maniacikarus Date: Mon, 27 Oct 2008 22:13:53 +0100 Subject: [PATCH] Deleted old Loadstat file, fixed logrotate warning, hwgraphs ignoring special characters, upgrade includes cgis by apache, made paralellism flag by config --- config/cron/minutely/loadstat | 13 --------- config/etc/logrotate.conf | 2 +- config/rootfiles/common/fcron | 1 - config/rootfiles/updater/filelists/files | 20 +------------- html/cgi-bin/hardwaregraphs.cgi | 34 +++++++++++++----------- make.sh | 6 +++-- 6 files changed, 25 insertions(+), 51 deletions(-) delete mode 100644 config/cron/minutely/loadstat diff --git a/config/cron/minutely/loadstat b/config/cron/minutely/loadstat deleted file mode 100644 index 9c6fdb9683..0000000000 --- a/config/cron/minutely/loadstat +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/perl - -use RRDs; -my $LOAD = ''; -my $CMD = "awk '{print \$1\":\"\$2\":\"\$3}' < /proc/loadavg"; -$LOAD=`$CMD`; -chomp($LOAD); -RRDs::update ("/var/log/rrd/load.rrd", - "-t", "load1:load5:load15", - "N:$LOAD"); - -my $ERROR = RRDs::error; -print "$ERROR\n" if $ERROR; diff --git a/config/etc/logrotate.conf b/config/etc/logrotate.conf index 0f171d6448..369efe9112 100644 --- a/config/etc/logrotate.conf +++ b/config/etc/logrotate.conf @@ -65,7 +65,7 @@ compress endscript } -/var/log/messages /var/log/boot.log /var/log/dhcpcd.log { +/var/log/messages /var/log/bootlog /var/log/dhcpcd.log { create 664 root syslogd sharedscripts ifempty diff --git a/config/rootfiles/common/fcron b/config/rootfiles/common/fcron index 13804884e7..2d74f99010 100644 --- a/config/rootfiles/common/fcron +++ b/config/rootfiles/common/fcron @@ -5,7 +5,6 @@ etc/fcron.daily etc/fcron.deny etc/fcron.hourly etc/fcron.minutely -#etc/fcron.minutely/loadstat etc/fcron.monthly etc/fcron.weekly usr/bin/fcronsighup diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files index 72c98bb455..d92d12cf69 100644 --- a/config/rootfiles/updater/filelists/files +++ b/config/rootfiles/updater/filelists/files @@ -1,4 +1,5 @@ opt/pakfire/db/core/mine +etc/logrotate.conf etc/rc.d/init.d/mISDN etc/modprobe.d/blacklist usr/bin/bc @@ -26,24 +27,6 @@ usr/local/bin/makegraphs usr/local/bin/hddshutdown usr/local/bin/squidctrl usr/local/bin/setddns.pl -srv/web/ipfire/cgi-bin/backup.cgi -srv/web/ipfire/cgi-bin/webaccess.cgi -srv/web/ipfire/cgi-bin/ovpnmain.cgi -srv/web/ipfire/cgi-bin/credits.cgi -srv/web/ipfire/cgi-bin/speed.cgi -srv/web/ipfire/cgi-bin/traffic.cgi -srv/web/ipfire/cgi-bin/hardwaregraphs.cgi -srv/web/ipfire/cgi-bin/connections.cgi -srv/web/ipfire/cgi-bin/pppsetup.cgi -srv/web/ipfire/cgi-bin/netexternal.cgi -srv/web/ipfire/cgi-bin/netinternal.cgi -srv/web/ipfire/cgi-bin/netother.cgi -srv/web/ipfire/cgi-bin/system.cgi -srv/web/ipfire/cgi-bin/services.cgi -srv/web/ipfire/cgi-bin/media.cgi -srv/web/ipfire/cgi-bin/memory.cgi -srv/web/ipfire/cgi-bin/ids.cgi -srv/web/ipfire/cgi-bin/ddns.cgi var/ipfire/backup/bin/backup.pl var/ipfire/sensors/ var/ipfire/menu.d/20-status.menu @@ -52,7 +35,6 @@ var/ipfire/firebuild var/ipfire/qos/bin/makeqosscripts.pl var/ipfire/proxy/advanced/useragents srv/web/ipfire/html/images/updbooster/ -srv/web/ipfire/cgi-bin/updatexlrator.cgi var/ipfire/updatexlrator/bin/ usr/sbin/updxlrator var/ipfire/langs diff --git a/html/cgi-bin/hardwaregraphs.cgi b/html/cgi-bin/hardwaregraphs.cgi index f1774afa02..781f30175b 100644 --- a/html/cgi-bin/hardwaregraphs.cgi +++ b/html/cgi-bin/hardwaregraphs.cgi @@ -83,8 +83,12 @@ if ( $querry[0] =~ "hwtemp"){ chomp($_); $_ =~ /\/(.*)sensors-(.*)\/(.*)\.rrd/; my $label = $2.$3;$label=~ s/-//g; - if ( $sensorsettings{'LINE-'.$label} ne "on" ){$sensorsettings{'LINE-'.$label} = 'off';} - elsif ( $sensorsettings{'LINE-'.$label} eq "on" ){$sensorsettings{'LINE-'.$label} = 'checked';} + if ( $sensorsettings{'LINE-'.$label} ne "on" ){ + $sensorsettings{'LINE-'.$label} = 'off'; + } elsif ($sensorsettings{'LINE-'.$label} eq "on" ){ + $sensorsettings{'LINE-'.$label} = 'checked'; + } + $sensorsettings{'LABEL-'.$label} =~ s/\W//g; } &General::writehash("${General::swroot}/sensors/settings", \%sensorsettings); } @@ -102,31 +106,31 @@ if ( $querry[0] =~ "hwtemp"){ } if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/thermal-thermal_zone*` ) { - &Header::openbox('100%', 'center', "ACPI Thermal-Zone Temp $Lang::tr{'graph'}"); - &Graphs::makegraphbox("hardwaregraphs.cgi","thermaltemp","day"); - &Header::closebox(); + &Header::openbox('100%', 'center', "ACPI Thermal-Zone Temp $Lang::tr{'graph'}"); + &Graphs::makegraphbox("hardwaregraphs.cgi","thermaltemp","day"); + &Header::closebox(); } if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/temperature-*` ) { - &Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}"); - &Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day"); - &Header::closebox(); + &Header::openbox('100%', 'center', "hwtemp $Lang::tr{'graph'}"); + &Graphs::makegraphbox("hardwaregraphs.cgi","hwtemp","day"); + Header::closebox(); } if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/fanspeed-*` ) { - &Header::openbox('100%', 'center', "hwfan $Lang::tr{'graph'}"); - &Graphs::makegraphbox("hardwaregraphs.cgi","hwfan","day"); - &Header::closebox(); + &Header::openbox('100%', 'center', "hwfan $Lang::tr{'graph'}"); + &Graphs::makegraphbox("hardwaregraphs.cgi","hwfan","day"); + &Header::closebox(); } if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*/voltage-*` ) { - &Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}"); - &Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day","375"); - &Header::closebox(); + &Header::openbox('100%', 'center', "hwvolt $Lang::tr{'graph'}"); + &Graphs::makegraphbox("hardwaregraphs.cgi","hwvolt","day","375"); + &Header::closebox(); } if ( `ls $mainsettings{'RRDLOG'}/collectd/localhost/sensors-*` ) { - sensorsbox(); + sensorsbox(); } &Header::closebigbox(); &Header::closepage(); diff --git a/make.sh b/make.sh index 4cc666c617..ed3fa8aba2 100755 --- a/make.sh +++ b/make.sh @@ -177,7 +177,9 @@ prepareenv() { # Setup environment set +h LC_ALL=POSIX - MAKETUNING="-j6" + if [ -z $MAKETUNING ]; then + MAKETUNING="-j6" + fi export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD @@ -350,7 +352,7 @@ buildipfire() { ipfiremake gdbm ipfiremake gmp ipfiremake pam - ipfiremake openssl PADLOCK=1 + ipfiremake openssl ipfiremake curl ipfiremake python ipfiremake libnet -- 2.39.2