Ended core 5 and started core 6
authormaniacikarus <maniacikarus@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Fri, 11 Jan 2008 18:26:42 +0000 (18:26 +0000)
committermaniacikarus <maniacikarus@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Fri, 11 Jan 2008 18:26:42 +0000 (18:26 +0000)
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

12 files changed:
config/cfgroot/graphs.pl
config/rootfiles/core/5/files
config/rootfiles/core/5/update.sh
config/rootfiles/core/6/files [new file with mode: 0644]
config/rootfiles/core/6/meta [new file with mode: 0644]
config/rootfiles/core/6/update.sh [new file with mode: 0644]
doc/packages-list.txt
langs/de/cgi-bin/de.pl
langs/en/cgi-bin/en.pl
make.sh
src/initscripts/init.d/squid
src/misc-progs/qosctrl.c

index c4dabe2..c5caa6d 100644 (file)
@@ -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,*",
index 0fa805c..a49abc8 100644 (file)
@@ -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
index 996249f..1778cc5 100644 (file)
@@ -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 (file)
index 0000000..e69de29
diff --git a/config/rootfiles/core/6/meta b/config/rootfiles/core/6/meta
new file mode 100644 (file)
index 0000000..d547fa8
--- /dev/null
@@ -0,0 +1 @@
+DEPS=""
diff --git a/config/rootfiles/core/6/update.sh b/config/rootfiles/core/6/update.sh
new file mode 100644 (file)
index 0000000..2392f5e
--- /dev/null
@@ -0,0 +1,4 @@
+#!/bin/bash
+. /opt/pakfire/lib/functions.sh
+extract_files
+rebuild_langcache
index 9f014f6..f7fc08a 100644 (file)
 * 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
index a04804a..191f6cc 100644 (file)
 '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',
index 0b4ed6e..92b1a02 100644 (file)
 '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 26728db..3274b94 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -523,7 +523,6 @@ buildipfire() {
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl
-  ipfiremake squidclam
 }
 
 buildinstaller() {
index c8a9b24..3c7941e 100644 (file)
@@ -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
index 8a8f07e..5e1420b 100644 (file)
 
 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;
 }