23 lines
1.1 KiB
Diff
23 lines
1.1 KiB
Diff
|
diff -up iproute2-20091106/examples/cbq.init-v0.7.3.fix iproute2-20091106/examples/cbq.init-v0.7.3
|
||
|
|
--- iproute2-20091106/examples/cbq.init-v0.7.3.fix 2009-11-10 19:41:44.000000000 +0100
|
||
|
|
+++ iproute2-20091106/examples/cbq.init-v0.7.3 2009-11-27 13:36:07.957310549 +0100
|
||
|
|
@@ -579,14 +579,14 @@ cbq_show () {
|
||
|
|
### Check configuration and load DEVICES, DEVFIELDS and CLASSLIST from $1
|
||
|
|
cbq_init () {
|
||
|
|
### Get a list of configured classes
|
||
|
|
- CLASSLIST=`find $1 \( -type f -or -type l \) -name 'cbq-*' \
|
||
|
|
- -not -name '*~' -maxdepth 1 -printf "%f\n"| sort`
|
||
|
|
+ CLASSLIST=`find $1 -maxdepth 1 \( -type f -or -type l \) -name 'cbq-*' \
|
||
|
|
+ -not -name '*~' -printf "%f\n"| sort`
|
||
|
|
[ -z "$CLASSLIST" ] &&
|
||
|
|
cbq_failure "no configuration files found in $1!"
|
||
|
|
|
||
|
|
### Gather all DEVICE fields from $1/cbq-*
|
||
|
|
- DEVFIELDS=`find $1 \( -type f -or -type l \) -name 'cbq-*' \
|
||
|
|
- -not -name '*~' -maxdepth 1| xargs sed -n 's/#.*//; \
|
||
|
|
+ DEVFIELDS=`find $1 -maxdepth 1 \( -type f -or -type l \) -name 'cbq-*' \
|
||
|
|
+ -not -name '*~' | xargs sed -n 's/#.*//; \
|
||
|
|
s/[[:space:]]//g; /^DEVICE=[^,]*,[^,]*\(,[^,]*\)\?/ \
|
||
|
|
{ s/.*=//; p; }'| sort -u`
|
||
|
|
[ -z "$DEVFIELDS" ] &&
|