1 |
diff -p -up resolvconf-1.38/bin/list-records.metric resolvconf-1.38/bin/list-records |
2 |
--- resolvconf-1.38/bin/list-records.metric 2006-08-09 15:36:43.000000000 +0200 |
3 |
+++ resolvconf-1.38/bin/list-records 2008-03-14 22:08:01.000000000 +0100 |
4 |
@@ -36,10 +36,17 @@ if [ -r /etc/resolvconf/interface-order |
5 |
/^$/d |
6 |
' /etc/resolvconf/interface-order)" |
7 |
fi |
8 |
+INTERFACES= |
9 |
shopt -s nullglob extglob |
10 |
-# Pathname expansion occurs on the following line resulting, in general, |
11 |
+while read P; do |
12 |
+ EXP=$(echo $P) |
13 |
+ [ -n "$EXP" ] && INTERFACES="$INTERFACES $(/lib/resolvconf/list-by-metric $EXP)" |
14 |
+done <<EOF |
15 |
+$PATTERNS |
16 |
+EOF |
17 |
+# Pathname expansion occurs on the previous lines resulting, in general, |
18 |
# in multiple instances of filenames; duplicates must be removed. |
19 |
-uniquify $PATTERNS |
20 |
+uniquify $INTERFACES |
21 |
RCRDS="" |
22 |
for FLNM in $RSLT ; do |
23 |
# Only list records of non-zero size |
24 |
diff -p -up resolvconf-1.38/man/interface-order.5.metric resolvconf-1.38/man/interface-order.5 |
25 |
--- resolvconf-1.38/man/interface-order.5.metric 2006-08-09 15:36:43.000000000 +0200 |
26 |
+++ resolvconf-1.38/man/interface-order.5 2008-03-14 22:06:51.000000000 +0100 |
27 |
@@ -10,6 +10,8 @@ resolvconf nameserver information record |
28 |
are processed |
29 |
by those resolvconf update scripts |
30 |
that consult this file. |
31 |
+In Mandriva, the expansion of each line is sorted again |
32 |
+by the metric value of the interfaces. |
33 |
(The name of the file is apt because |
34 |
a resolvconf nameserver information record |
35 |
is named after the interface with which it is associated.) |
36 |
diff -p -up resolvconf-1.38/man/resolvconf.8.metric resolvconf-1.38/man/resolvconf.8 |