diff -Nru resolvconf-1.78ubuntu5~ppa0/debian/changelog resolvconf-1.78ubuntu5~ppa1/debian/changelog --- resolvconf-1.78ubuntu5~ppa0/debian/changelog 2017-09-25 03:54:29.000000000 +0000 +++ resolvconf-1.78ubuntu5~ppa1/debian/changelog 2017-09-25 03:54:29.000000000 +0000 @@ -1,4 +1,4 @@ -resolvconf (1.78ubuntu5~ppa0) xenial; urgency=medium +resolvconf (1.78ubuntu5~ppa1) xenial; urgency=medium * support reading dns information written by initramfs. (LP: #1711760) diff -Nru resolvconf-1.78ubuntu5~ppa0/lib/net-interface-handler resolvconf-1.78ubuntu5~ppa1/lib/net-interface-handler --- resolvconf-1.78ubuntu5~ppa0/lib/net-interface-handler 2017-09-25 03:54:29.000000000 +0000 +++ resolvconf-1.78ubuntu5~ppa1/lib/net-interface-handler 2017-09-25 03:54:29.000000000 +0000 @@ -109,7 +109,7 @@ if [ -z "$rconf" ]; then debug "no search or nameservers found in $*" fi - if [ "$rconf" = "-" ]; then + if [ "$output" = "-" ]; then echo -n "$rconf" else echo -n "$rconf" > "$output" @@ -122,14 +122,14 @@ assert_environment || return should_be_enabled || return 0 - local dev="$INTERFACE" i="" rconf="" + local iface="$INTERFACE" i="" rconf="" set -- - for i in "/run/net-$dev.conf" "/run/net6-$dev.conf"; do + for i in "/run/net-$iface.conf" "/run/net6-$iface.conf"; do [ -f "$i" ] || continue set -- "$@" "$i" done if [ $# -eq 0 ]; then - debug "no /run/net*-$dev.conf files found." + debug "no /run/net*-$iface.conf files found." return 0 fi