+------------------------------------------------------------------------
+r268 | ms | 2006-09-10 21:52:20 +0200 (Sun, 10 Sep 2006) | 5 lines
+
+Geaendert:
+ * Squid auf neuesten Stand gebracht.
+ * QoS-Fortschritt.
+ * Kleines Script fuer Sprachdateiupdates.
+
------------------------------------------------------------------------
r267 | ms | 2006-09-02 22:18:51 +0200 (Sat, 02 Sep 2006) | 4 lines
if ($qossettings{'ACTION'} eq 'Start')
{
- system("sleep 1 && /usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh &");
+ system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
system("/bin/touch /var/ipfire/qos/enable");
- system("sleep 2 && /usr/local/bin/qosctrl start >/dev/null 2>&1");
+ system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
system("logger -t ipfire 'QoS started'");
$qossettings{'ENABLED'} = 'on';
&General::writehash("${General::swroot}/qos/settings", \%qossettings);
{
if ($qossettings{'ENABLED'} eq 'on'){
system("/usr/local/bin/qosctrl stop >/dev/null 2>&1");
- system("sleep 1 && /usr/bin/perl /var/ipfire/qos/bin/makeqosscripts.pl > /var/ipfire/qos/bin/qos.sh &");
- system("sleep 5 && /usr/local/bin/qosctrl start >/dev/null 2>&1");
+ system("/usr/local/bin/qosctrl generate >/dev/null 2>&1");
+ system("/usr/local/bin/qosctrl start >/dev/null 2>&1");
system("logger -t ipfire 'QoS restarted'");
}
}
exit(1);
if (argc < 2) {
- fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|stop|restart|status)\n\n");
+ fprintf(stderr, "\nNo argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n");
exit(1);
}
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 2>/dev/null");
} else {
- fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status)\n\n");
+ fprintf(stderr, "\nBad argument given.\n\nqosctrl (start|stop|restart|status|generate)\n\n");
exit(1);
}