commit: 735b7e1b920874fe2f588f5b9385ff40d33c48c2
Author: Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Sun Jan 15 06:09:40 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 15 14:03:29 2023 +0000
URL: https://gitweb.gentoo.org/proj/netifrc.git/commit/?id=735b7e1b
net/l2tp.sh: Favour IFACE over IFVAR in an informational message
IFVAR is (supposed to be) requoted for injection, so it doesn't make any sense
to expand it within the second argument given to eend.
Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
net/l2tp.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/l2tp.sh b/net/l2tp.sh
index ad459df..2221d26 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_${IFVAR}"
+ eend 1 "${key} defines a \"tunnel_id\" parameter that
contradicts l2tpsession_${IFNAME}"
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
