Protocols are normally interface:protocol, so sort by this accordingly.
authorRoy Marples <roy@marples.name>
Sun, 2 Dec 2012 00:37:12 +0000 (00:37 +0000)
committerRoy Marples <roy@marples.name>
Sun, 2 Dec 2012 00:37:12 +0000 (00:37 +0000)
resolvconf.in

index 533231a5800412da649d83cd73b6a0ca16b86f7c..50152228aec5540e123aaec61ee0984fad99d2d2 100644 (file)
@@ -138,10 +138,9 @@ parse_resolv()
                                        cd "$IFACEDIR"
                                        private=false
                                        for p in $private_interfaces; do
-                                               if [ "$p" = "$iface" ]; then
-                                                       private=true
-                                                       break
-                                               fi
+                                               case "$iface" in
+                                               "$p"|"$p":*) private=true; break;;
+                                               esac
                                        done
                                fi
                        fi
@@ -254,11 +253,19 @@ list_resolv()
                cd "$IFACEDIR"
                for i in $interface_order; do
                        [ -e "$i" ] && list="$list $i"
+                       for ii in "$i":*; do
+                               [ -e "$ii" ] && list="$list $ii"
+                       done
                done
                for i in $dynamic_order; do
                        if [ -e "$i" -a ! -e "$METRICDIR/"*" $i" ]; then
                                list="$list $i"
                        fi
+                       for ii in "$i":*; do
+                               if [ -e "$ii" -a ! -e "$METRICDIR/"*" $ii" ]; then
+                                       list="$list $ii"
+                               fi
+                       done
                done
                if [ -d "$METRICDIR" ]; then
                        cd "$METRICDIR"