webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 03:33:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thirteen' of git.ipfire.org:/pub/git/ipfire-2.x into thirteen

Browse Source
This commit is contained in:
Arne Fitzenreiter
2012-08-31 12:24:16 -04:00
parent 544f40d4f8 7837dadb73
commit b9d51680a6
13 changed files with 225 additions and 237 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
config/qos/makeqosscripts.pl
View File

@@ -76,6 +76,7 @@ $qossettings{'IMQ_DEV'} = 'imq0';
$qossettings{'TOS'} = '';
$qossettings{'VALID'} = 'yes';
$qossettings{'IMQ_MODE'} = 'PREROUTING';
$qossettings{'QLENGTH'} = '1000';
&General::readhash("${General::swroot}/qos/settings", \%qossettings);
@@ -480,7 +481,7 @@ foreach $classentry (sort @classes)
if ($qossettings{'IMQ_DEV'} eq $classline[0]) {
$qossettings{'DEVICE'} = $classline[0];
$qossettings{'CLASS'} = $classline[1];
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: sfq perturb $qossettings{'SFQ_PERTUB'}\n";
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'CLASS'} handle $qossettings{'CLASS'}: fq_codel\n";
}
}
foreach $subclassentry (sort @subclasses) {
@@ -488,7 +489,7 @@ foreach $subclassentry (sort @subclasses) {
if ($qossettings{'IMQ_DEV'} eq $subclassline[0]) {
$qossettings{'DEVICE'} = $subclassline[0];
$qossettings{'SCLASS'} = $subclassline[2];
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: sfq perturb $qossettings{'SFQ_PERTUB'}\n";
print "\ttc qdisc add dev $qossettings{'DEVICE'} parent 2:$qossettings{'SCLASS'} handle $qossettings{'SCLASS'}: fq_codel\n";
}
}
print "\n\t### FILTER TRAFFIC INTO CLASSES\n";

21
config/rootfiles/common/dejavu-fonts-ttf Normal file
View File

@@ -0,0 +1,21 @@
usr/share/fonts/DejaVuSans-Bold.ttf
usr/share/fonts/DejaVuSans-BoldOblique.ttf
usr/share/fonts/DejaVuSans-ExtraLight.ttf
usr/share/fonts/DejaVuSans-Oblique.ttf
usr/share/fonts/DejaVuSans.ttf
#usr/share/fonts/DejaVuSansCondensed-Bold.ttf
#usr/share/fonts/DejaVuSansCondensed-BoldOblique.ttf
#usr/share/fonts/DejaVuSansCondensed-Oblique.ttf
#usr/share/fonts/DejaVuSansCondensed.ttf
#usr/share/fonts/DejaVuSansMono-Bold.ttf
#usr/share/fonts/DejaVuSansMono-BoldOblique.ttf
#usr/share/fonts/DejaVuSansMono-Oblique.ttf
#usr/share/fonts/DejaVuSansMono.ttf
#usr/share/fonts/DejaVuSerif-Bold.ttf
#usr/share/fonts/DejaVuSerif-BoldItalic.ttf
#usr/share/fonts/DejaVuSerif-Italic.ttf
#usr/share/fonts/DejaVuSerif.ttf
#usr/share/fonts/DejaVuSerifCondensed-Bold.ttf
#usr/share/fonts/DejaVuSerifCondensed-BoldItalic.ttf
#usr/share/fonts/DejaVuSerifCondensed-Italic.ttf
#usr/share/fonts/DejaVuSerifCondensed.ttf

31
config/rootfiles/common/texinfo
View File

@@ -2,23 +2,26 @@
#usr/bin/infokey
#usr/bin/install-info
#usr/bin/makeinfo
#usr/bin/pdftexi2dvi
#usr/bin/texi2dvi
#usr/bin/texi2pdf
#usr/bin/texindex
#usr/info/info-stnd.info
#usr/info/info.info
#usr/info/texinfo
#usr/info/texinfo-1
#usr/info/texinfo-2
#usr/info/texinfo-3
#usr/man/man1/info.1
#usr/man/man1/infokey.1
#usr/man/man1/install-info.1
#usr/man/man1/makeinfo.1
#usr/man/man1/texi2dvi.1
#usr/man/man1/texindex.1
#usr/man/man5/info.5
#usr/man/man5/texinfo.5
#usr/share/info/info-stnd.info
#usr/share/info/info.info
#usr/share/info/texinfo
#usr/share/info/texinfo-1
#usr/share/info/texinfo-2
#usr/share/info/texinfo-3
#usr/share/man/man1/info.1
#usr/share/man/man1/infokey.1
#usr/share/man/man1/install-info.1
#usr/share/man/man1/makeinfo.1
#usr/share/man/man1/pdftexi2dvi.1
#usr/share/man/man1/texi2dvi.1
#usr/share/man/man1/texi2pdf.1
#usr/share/man/man1/texindex.1
#usr/share/man/man5/info.5
#usr/share/man/man5/texinfo.5
#usr/share/texinfo
#usr/share/texinfo/texinfo.cat
#usr/share/texinfo/texinfo.dtd

2
config/rootfiles/common/zlib
View File

@@ -3,7 +3,7 @@ lib/libz.so.1.2.7
#usr/include/zconf.h
#usr/include/zlib.h
#usr/lib/libz.a
#usr/lib/libz.so
usr/lib/libz.so
#usr/lib/pkgconfig
#usr/lib/pkgconfig/zlib.pc
#usr/share/man/man3/zlib.3