From c0dd2a3bd6a010ec88ebfd7d108ab9ef06798008 Mon Sep 17 00:00:00 2001 From: Stefan Fuchs Date: Sun, 26 Jan 2020 11:18:39 +1100 Subject: [PATCH] Make ip commands explicit On buster, ip r l m doesn't work, but route list match does --- openvpn/start.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/openvpn/start.sh b/openvpn/start.sh index f455f8d07..20b23d6d6 100755 --- a/openvpn/start.sh +++ b/openvpn/start.sh @@ -125,10 +125,10 @@ TRANSMISSION_CONTROL_OPTS="--script-security 2 --up-delay --up /etc/openvpn/tunn ## If we use UFW or the LOCAL_NETWORK we need to grab network config info if [[ "${ENABLE_UFW,,}" == "true" ]] || [[ -n "${LOCAL_NETWORK-}" ]]; then - eval $(/sbin/ip r l m 0.0.0.0 | awk '{if($5!="tun0"){print "GW="$3"\nINT="$5; exit}}') + eval $(/sbin/ip route list match 0.0.0.0 | awk '{if($5!="tun0"){print "GW="$3"\nINT="$5; exit}}') ## IF we use UFW_ALLOW_GW_NET along with ENABLE_UFW we need to know what our netmask CIDR is if [[ "${ENABLE_UFW,,}" == "true" ]] && [[ "${UFW_ALLOW_GW_NET,,}" == "true" ]]; then - eval $(ip r l dev ${INT} | awk '{if($5=="link"){print "GW_CIDR="$1; exit}}') + eval $(/sbin/ip route list dev ${INT} | awk '{if($5=="link"){print "GW_CIDR="$1; exit}}') fi fi @@ -197,7 +197,7 @@ if [[ -n "${LOCAL_NETWORK-}" ]]; then if [[ -n "${GW-}" ]] && [[ -n "${INT-}" ]]; then for localNet in ${LOCAL_NETWORK//,/ }; do echo "adding route to local network ${localNet} via ${GW} dev ${INT}" - /sbin/ip r a "${localNet}" via "${GW}" dev "${INT}" + /sbin/ip route add "${localNet}" via "${GW}" dev "${INT}" if [[ "${ENABLE_UFW,,}" == "true" ]]; then ufwAllowPortLong TRANSMISSION_RPC_PORT localNet if [[ -n "${UFW_EXTRA_PORTS-}" ]]; then