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 c4dabe2b46a4aa390a40e08824ae725878a25fa3..c5caa6d043da91fc374ad33baf6f0036a19b6815 100644 (file)
--- 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",
         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"},
         "--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"},
         "--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",
         "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"},
   "--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",
   "-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",
   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"},
   "--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"},
   "--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,*",
   "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 0fa805c8cd09bac3d97354495dc28ad319177a3b..a49abc806c95728b7402c8b3de9ffd3a60528cab 100644 (file)
--- 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
 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 996249fa7ac827148cf005dc4d28fb116672ed4b..1778cc5d021b9f5f590c44d4fe57c2931f4e03ac 100644 (file)
--- 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
 #!/bin/bash
 . /opt/pakfire/lib/functions.sh
 extract_files

+rebuild_langcache

 depmod -a
 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
+++ 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 (file)
index 0000000..2392f5e
--- /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 9f014f68af9902b04446ac1c2281f38c38b80725..f7fc08a926a4ad69f9f17703ce39f3ff90c69545 100644 (file)
--- 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
 * 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
 * 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 a04804ab13d4fdcbd8f2de7d60fd12037b2d277e..191f6cc950687941fd83a52211dd21f26419aa87 100644 (file)
--- 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',
 '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',
 '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 0b4ed6ef5534cd7dae4e66cee30ec95796ea6813..92b1a02d31e772431b67c5d2c2b93a3f2778c5f8 100644 (file)
--- 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',
 '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',
 'green' => 'GREEN',
 'green interface' => 'Green Interface',
 'guaranteed bandwith' => 'Guaranteed bandwith',

diff --git a/make.sh b/make.sh
index 26728db55854e228a4183ff515f5a82274960c2d..3274b94c2877a18c7f8d7f6f4aa3470290f07ce4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -523,7 +523,6 @@ buildipfire() {
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl
   ipfiremake lsof
   ipfiremake centerim
   ipfiremake br2684ctl

-  ipfiremake squidclam

 }
 
 buildinstaller() {
 }
 
 buildinstaller() {

diff --git a/src/initscripts/init.d/squid b/src/initscripts/init.d/squid
index c8a9b245ea35786933d931c2de5a977a11868693..3c7941ea64090c1a84b7d6a1e43a49dee6435ca3 100644 (file)
--- a/src/initscripts/init.d/squid
+++ b/src/initscripts/init.d/squid
@@ -65,7 +65,7 @@ case "$1" in
 
        stop)
        
 
        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
                        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 8a8f07ebc099eb5c17613bf4c89f1bfc5a8a1a06..5e1420b9d28f06cc224811e4210327db949b3acd 100644 (file)
--- a/src/misc-progs/qosctrl.c
+++ b/src/misc-progs/qosctrl.c
@@ -15,38 +15,41 @@
 
 int main(int argc, char *argv[]) {
 
 
 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;

 }
 }