From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1477689-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 8A7BC15800F
for <garchives@archives.gentoo.org>; Sun, 15 Jan 2023 14:03:37 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id AB319E0837;
Sun, 15 Jan 2023 14:03:36 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 83E3DE0837
for <gentoo-commits@lists.gentoo.org>; Sun, 15 Jan 2023 14:03:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 7169C340F56
for <gentoo-commits@lists.gentoo.org>; Sun, 15 Jan 2023 14:03:35 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 069FD82E
for <gentoo-commits@lists.gentoo.org>; Sun, 15 Jan 2023 14:03:33 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1673791409.735b7e1b920874fe2f588f5b9385ff40d33c48c2.sam@OpenRC>
Subject: [gentoo-commits] proj/netifrc:master commit in: net/
X-VCS-Repository: proj/netifrc
X-VCS-Files: net/l2tp.sh
X-VCS-Directories: net/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 735b7e1b920874fe2f588f5b9385ff40d33c48c2
X-VCS-Branch: master
Date: Sun, 15 Jan 2023 14:03:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: eedb579d-9a6a-4a6a-b825-6986f885dfde
X-Archives-Hash: cb3a706533f3035bf23c623ebd13e577
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