Control: tags -1 + moreinfo
On Sat, 2020-06-27 at 13:51 +0200, Valentin Vidic wrote:
> Please approve the following fix for IPsrcaddr agent in buster:
>
> diff -Nru resource-agents-4.2.0/debian/changelog resource-agents-
> 4.2.0/debian/changelog
> --- resource-agents-4.2.0/debian/changelog 2019-08-04
> 09:59:39.000000000 +0200
> +++ resource-agents-4.2.0/debian/changelog 2020-06-27
> 13:26:42.000000000 +0200
> @@ -1,3 +1,9 @@
> +resource-agents (1:4.2.0-2+deb10u2) buster; urgency=medium
> +
> + * debian/patches: add ipsrcaddr-proto.patch (Closes: #963691)
I assume these changes are no-ops, but why are they included? They
don't appear to actually relate to the issue - the first two even more
so.
[...]
> +- ip route replace $NETWORK dev $INTERFACE src $1 || \
> ++ $IP2UTIL route replace $NETWORK dev $INTERFACE src $1
> || \
> + errorexit "command 'ip route replace $NETWORK
> dev $INTERFACE src $1' failed"
> +
> + $CMDCHANGE $ROUTE_WO_SRC src $1 || \
> +@@ -204,7 +217,7 @@ srca_stop() {
> +
> + [ $rc = 2 ] && errorexit "The address you specified to stop
> does not match the preferred source address"
> +
> +- ip route replace $NETWORK dev $INTERFACE || \
> ++ $IP2UTIL route replace $NETWORK dev $INTERFACE || \
> + errorexit "command 'ip route replace $NETWORK dev
> $INTERFACE' failed"
> +
> + $CMDCHANGE $ROUTE_WO_SRC || \
> +@@ -473,7 +486,7 @@ rc=$?
> + }
> +
> + INTERFACE=`echo $findif_out | awk '{print $1}'`
> +-NETWORK=`ip route list dev $INTERFACE scope link proto kernel match
> $ipaddress|grep -o '^[^ ]*'`
> ++NETWORK=`$IP2UTIL route list dev $INTERFACE scope link $PROTO match
> $ipaddress|grep -m 1 -o '^[^ ]*'`
Regards,
Adam
