From 315341e5af9dad09ca4e5c1ff8b16e3c0fc72898 Mon Sep 17 00:00:00 2001 From: Kerin Millar Date: Sun, 15 Jan 2023 19:30:35 +0000 Subject: net/l2tp.sh: Really favour IFACE over IFVAR in an informational message The previous commit intended to replace an instance of IFVAR with IFACE. Instead, it replaced with IFNAME, which means nothing to netifrc. Frustratingly, I had realised my error at the time of submitting the patch, yet still managed to attach a bad one. Make it right. Signed-off-by: Kerin Millar Signed-off-by: Sam James --- net/l2tp.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net/l2tp.sh b/net/l2tp.sh index 2221d26..aa8e3fd 100644 --- a/net/l2tp.sh +++ b/net/l2tp.sh @@ -39,7 +39,7 @@ l2tp_pre_start() { elif ! declared_tunnel=$(_l2tp_parse_opts "${l2tptunnel}" "local peer_tunnel_id remote tunnel_id" "encap"); then eend 1 "${key} is missing at least one required parameter" elif set -- "${tunnel_id}"; eval "${declared_tunnel}"; [ "$1" != "${tunnel_id}" ]; then - eend 1 "${key} defines a \"tunnel_id\" parameter that contradicts l2tpsession_${IFNAME}" + eend 1 "${key} defines a \"tunnel_id\" parameter that contradicts l2tpsession_${IFACE:?}" elif _l2tp_should_add_tunnel "${tunnel_id}" "${declared_tunnel}"; set -- $?; [ "$1" -eq 2 ]; then eend 1 "Tunnel #${tunnel_id} exists but its properties mismatch those defined by ${key}" elif [ "$1" -eq 1 ]; then -- cgit v1.2.3-65-gdbad