From: maniacikarus Date: Fri, 11 Jan 2008 18:26:42 +0000 (+0000) Subject: Ended core 5 and started core 6 X-Git-Tag: v2.3-beta1~228 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=af95dec53c1f58f0eb5b616bcfd497e584f4808c Ended core 5 and started core 6 Fixed qosctrl Fixed Squid init script Cosmetic changes for the graphswq git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1140 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/config/cfgroot/graphs.pl b/config/cfgroot/graphs.pl index c4dabe2b46..c5caa6d043 100644 --- a/config/cfgroot/graphs.pl +++ b/config/cfgroot/graphs.pl @@ -112,7 +112,7 @@ sub updateloadgraph { RRDs::graph ("$graphs/load-$period.png", "--start", "-1$period", "-aPNG", "-w 600", "-h 100", "-i", "-z", "-W www.ipfire.org", "-l 0", "-r", "--alt-y-grid", - "-t Load Average", + "-t Load Average $Lang::tr{'graph per'} $Lang::tr{$period}", "--color", "SHADEA".$color{"color19"}, "--color", "SHADEB".$color{"color19"}, "--color", "BACK".$color{"color21"}, @@ -227,7 +227,7 @@ sub updatediskgraph { "--color", "SHADEA".$color{"color19"}, "--color", "SHADEB".$color{"color19"}, "--color", "BACK".$color{"color21"}, - "-t $Lang::tr{'disk access per'} $Lang::tr{$period} $disk", + "-t $disk $Lang::tr{'disk access per'} $Lang::tr{$period}", "DEF:read=$rrdlog/disk-$disk.rrd:readsect:AVERAGE", "DEF:write=$rrdlog/disk-$disk.rrd:writesect:AVERAGE", "DEF:standby=$rrdlog/hddshutdown-$disk.rrd:standby:AVERAGE", @@ -259,7 +259,7 @@ sub updateifgraph { "--color", "SHADEA".$color{"color19"}, "--color", "SHADEB".$color{"color19"}, "--color", "BACK".$color{"color21"}, - "-t $Lang::tr{'traffic on'} $interface ($Lang::tr{'graph per'} $Lang::tr{$period})", + "-t $Lang::tr{'traffic on'} $interface $Lang::tr{'graph per'} $Lang::tr{$period}", "-v$Lang::tr{'bytes per second'}", "DEF:incoming=$rrdlog/$interface.rrd:incoming:AVERAGE", "DEF:outgoing=$rrdlog/$interface.rrd:outgoing:AVERAGE", @@ -318,7 +318,7 @@ sub updatelqgraph { RRDs::graph ("$graphs/lq-$period.png", "--start", "-1$period", "-aPNG", "-i", "-z", "-W www.ipfire.org", "--alt-y-grid", "-w 600", "-h 100", "-l 0", "-r", - "-t $Lang::tr{'linkq'} ($Lang::tr{'graph per'} $Lang::tr{$period})", + "-t $Lang::tr{'linkq'} $Lang::tr{'graph per'} $Lang::tr{$period}", "--lazy", "--color", "SHADEA".$color{"color19"}, "--color", "SHADEB".$color{"color19"}, @@ -368,7 +368,7 @@ sub updatehddgraph { "--color", "SHADEA".$color{"color19"}, "--color", "SHADEB".$color{"color19"}, "--color", "BACK".$color{"color21"}, - "-t $Lang::tr{'harddisk temperature'} ($Lang::tr{'graph per'} $Lang::tr{$period})", + "-t $disk $Lang::tr{'harddisk temperature'} $Lang::tr{'graph per'} $Lang::tr{$period}", "DEF:temperature=$rrdlog/hddtemp-$disk.rrd:temperature:AVERAGE", "DEF:standby=$rrdlog/hddshutdown-$disk.rrd:standby:AVERAGE", "CDEF:st=standby,INF,*", diff --git a/config/rootfiles/core/5/files b/config/rootfiles/core/5/files index 0fa805c8cd..a49abc806c 100644 --- a/config/rootfiles/core/5/files +++ b/config/rootfiles/core/5/files @@ -1,2 +1,6 @@ lib/modules/2.6.16.57-ipfire/kernel/fs/nfsd/nfsd.ko lib/modules/2.6.16.57-ipfire-smp/kernel/fs/nfsd/nfsd.ko +usr/local/bin/qosctrl +etc/init.d/squid +var/ipfire/langs +var/ipfire/graphs.pl diff --git a/config/rootfiles/core/5/update.sh b/config/rootfiles/core/5/update.sh index 996249fa7a..1778cc5d02 100644 --- a/config/rootfiles/core/5/update.sh +++ b/config/rootfiles/core/5/update.sh @@ -1,4 +1,5 @@ #!/bin/bash . /opt/pakfire/lib/functions.sh extract_files +rebuild_langcache depmod -a diff --git a/config/rootfiles/core/6/files b/config/rootfiles/core/6/files new file mode 100644 index 0000000000..e69de29bb2 diff --git a/config/rootfiles/core/6/meta b/config/rootfiles/core/6/meta new file mode 100644 index 0000000000..d547fa86fa --- /dev/null +++ b/config/rootfiles/core/6/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/6/update.sh b/config/rootfiles/core/6/update.sh new file mode 100644 index 0000000000..2392f5e712 --- /dev/null +++ b/config/rootfiles/core/6/update.sh @@ -0,0 +1,4 @@ +#!/bin/bash +. /opt/pakfire/lib/functions.sh +extract_files +rebuild_langcache diff --git a/doc/packages-list.txt b/doc/packages-list.txt index 9f014f68af..f7fc08a926 100644 --- a/doc/packages-list.txt +++ b/doc/packages-list.txt @@ -228,7 +228,6 @@ * squid-2.6.STABLE16 * squid-graph-3.2 * squidGuard-1.3 -* squidclam-0.23 * sudo-1.6.8p12 * sysfsutils-1.3.0 * sysklogd-1.4.1 diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl index a04804ab13..191f6cc950 100644 --- a/langs/de/cgi-bin/de.pl +++ b/langs/de/cgi-bin/de.pl @@ -780,7 +780,7 @@ 'genre' => 'Genre', 'global settings' => 'Globale Einstellungen', 'graph' => 'Diagramm', -'graph per' => 'Diagramm pro', +'graph per' => 'pro', 'green' => 'GRÜN', 'green interface' => 'Grünes Interface', 'guaranteed bandwith' => 'Garantierte Bandbreite', diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl index 0b4ed6ef55..92b1a02d31 100644 --- a/langs/en/cgi-bin/en.pl +++ b/langs/en/cgi-bin/en.pl @@ -806,7 +806,7 @@ 'genre' => 'Genre', 'global settings' => 'Global settings', 'graph' => 'Graph', -'graph per' => 'Graph per', +'graph per' => 'per', 'green' => 'GREEN', 'green interface' => 'Green Interface', 'guaranteed bandwith' => 'Guaranteed bandwith', diff --git a/make.sh b/make.sh index 26728db558..3274b94c28 100755 --- a/make.sh +++ b/make.sh @@ -523,7 +523,6 @@ buildipfire() { ipfiremake lsof ipfiremake centerim ipfiremake br2684ctl - ipfiremake squidclam } buildinstaller() { diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid index c8a9b245ea..3c7941ea64 100644 --- a/src/initscripts/init.d/squid +++ b/src/initscripts/init.d/squid @@ -65,7 +65,7 @@ case "$1" in stop) - if [ -e /var/ipfire/proxy/enable -o -e /var/ipfire/proxy/enable_blue ]; then + if [ -e /var/run/squid.pid ]; then boot_mesg "Stopping Squid Proxy Server..." iptables -t nat -F SQUID squid -k shutdown >/dev/null 2>&1 diff --git a/src/misc-progs/qosctrl.c b/src/misc-progs/qosctrl.c index 8a8f07ebc0..5e1420b9d2 100644 --- a/src/misc-progs/qosctrl.c +++ b/src/misc-progs/qosctrl.c @@ -15,38 +15,41 @@ int main(int argc, char *argv[]) { - int fd = -1; - - if (!(initsetuid())) - exit(1); - - if (argc < 2) { - fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n"); - exit(1); - } - - if ((fd = open("/var/ipfire/qos/bin/qos.sh", O_RDONLY)) != -1) { - close(fd); - } else { - // If there is no qos.sh do nothing. - exit(0); - } - - safe_system("chmod 755 /var/ipfire/qos/bin/qos.sh &>/dev/null"); - if (strcmp(argv[1], "start") == 0) { - safe_system("/var/ipfire/qos/bin/qos.sh start"); - } else if (strcmp(argv[1], "stop") == 0) { - safe_system("/var/ipfire/qos/bin/qos.sh clear"); - } else if (strcmp(argv[1], "status") == 0) { - safe_system("/var/ipfire/qos/bin/qos.sh status"); - } else if (strcmp(argv[1], "restart") == 0) { - safe_system("/var/ipfire/qos/bin/qos.sh restart"); - } else if (strcmp(argv[1], "generate") == 0) { - safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh"); - } else { - fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n"); - exit(1); - } - - return 0; + int fd = -1; + + if (!(initsetuid())) + exit(1); + + if (argc < 2) { + fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n"); + exit(1); + } + + if (strcmp(argv[1], "generate") == 0) { + safe_system("/usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh"); + } + + if ((fd = open("/var/ipfire/qos/bin/qos.sh", O_RDONLY)) != -1) { + close(fd); + } else { + // If there is no qos.sh do nothing. + exit(0); + } + + safe_system("chmod 755 /var/ipfire/qos/bin/qos.sh &>/dev/null"); + if (strcmp(argv[1], "start") == 0) { + safe_system("/var/ipfire/qos/bin/qos.sh start"); + } else if (strcmp(argv[1], "stop") == 0) { + safe_system("/var/ipfire/qos/bin/qos.sh clear"); + } else if (strcmp(argv[1], "status") == 0) { + safe_system("/var/ipfire/qos/bin/qos.sh status"); + } else if (strcmp(argv[1], "restart") == 0) { + safe_system("/var/ipfire/qos/bin/qos.sh restart"); + } else { + if (strcmp(argv[1], "generate") == 0) {exit(0);} + fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n"); + exit(1); + } + + return 0; }