diff -Nru ifupdown-0.8.36+nmu1ubuntu3/debian/if-down.d/resolved ifupdown-new/debian/if-down.d/resolved --- ifupdown-0.8.36+nmu1ubuntu3/debian/if-down.d/resolved 2020-07-28 10:55:18.000000000 +0100 +++ ifupdown-new/debian/if-down.d/resolved 2022-10-11 17:23:11.715870100 +0100 @@ -9,7 +9,6 @@ esac if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then - mystatedir statedir ifindex interface interface=$IFACE if [ ! "$interface" ]; then return diff -Nru ifupdown-0.8.36+nmu1ubuntu3/debian/if-up.d/resolved ifupdown-new/debian/if-up.d/resolved --- ifupdown-0.8.36+nmu1ubuntu3/debian/if-up.d/resolved 2022-04-17 22:21:44.000000000 +0100 +++ ifupdown-new/debian/if-up.d/resolved 2022-10-11 17:22:02.665870100 +0100 @@ -9,7 +9,6 @@ esac if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then - mystatedir statedir ifindex interface interface=$IFACE if [ ! "$interface" ]; then @@ -37,19 +36,19 @@ NEW_DEFAULT_ROUTE=$IF_DNS_DEFAULT_ROUTE NEW_DNS=$(echo $IF_DNS_NAMESERVERS $IF_DNS_NAMESERVER) NEW_DOMAINS=$(echo $IF_DNS_DOMAIN $IF_DNS_SEARCH) - DNS=DNS - DOMAINS=DOMAINS + dns_varname=DNS + domains_varname=DOMAINS if [ "$ADDRFAM" = "inet6" ]; then - DNS=DNS6 - DOMAINS=DOMAINS6 + dns_varname=DNS6 + domains_varname=DOMAINS6 fi if [ -n "$NEW_DNS" ]; then cat <"$mystatedir/ifupdown-${ADDRFAM}-$interface" -"$DNS"="$NEW_DNS" +$dns_varname="$NEW_DNS" EOF if [ -n "$NEW_DOMAINS" ]; then cat <>"$mystatedir/ifupdown-${ADDRFAM}-$interface" -"$DOMAINS"="$NEW_DOMAINS" +$domains_varname="$NEW_DOMAINS" EOF fi fi @@ -68,7 +67,6 @@ # ignore errors due to nonexistent file md5sum "$mystatedir/isc-dhcp-v4-$interface" "$mystatedir/isc-dhcp-v6-$interface" "$mystatedir/ifupdown-inet-$interface" "$mystatedir/ifupdown-inet6-$interface" > "$newstate" 2> /dev/null || true if ! cmp --silent "$oldstate" "$newstate" 2>/dev/null; then - DNS DNS6 DOMAINS DOMAINS6 DEFAULT_ROUTE # v4 first if [ -e "$mystatedir/isc-dhcp-v4-$interface" ]; then . "$mystatedir/isc-dhcp-v4-$interface"