From nobody Fri Oct 6 16:40:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4S2DgW3WnWz4x2XL; Fri, 6 Oct 2023 16:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S2DgW2lpKz4QSR; Fri, 6 Oct 2023 16:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696610423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L2YMgFsBueVdIUF+NtJw5K00qkcFw1Ess5WSkvTB5Ao=; b=d46I7hLxmhGnzlxZTRVKphHdT9N9c/zO86UU7Xq/hslsRlMSyYQWYuQa7XkgjXHZZtusvq bklTubpypW9A8BJguoWQxBvrbiMif7jMbD30/EXuNzzG3vCFkPTijDCh1ZqSFZW0zF4QAB /y2Yy9+Rk1UbV38AH+2B/p9xoiVltS14vwmXyj/rjuP/ksLx94e0qUsYCwbiRXxpe0DbDj T93jh02HaQZJOCuVXlROH8Mkqc8wlYCVbswFFdgU/c7Us62hthCn/1Fttyf9UKX6ewnlrJ U7P2Iv0WgD4ZDRkbtBcIIGXc02kS1wGBv9+fOmXZ4Ngc9++7+j6RN8H4Au5cew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696610423; a=rsa-sha256; cv=none; b=S/HhdCh5eyi2plfoy67tdzbFtMkLx8RoLNmHfJeNxbkwvzolPq6IfqqPta2Bw4FY/KLC+X 8q74IfBrzUtXyiB2wgtYFwmNRCm/mEEL0oZjdYSpVvGRqxAjzmgV6Npfn/9SeRdS0nqmss CktGY2FbbenLLMczu/QK4/nLZqmwsl3k+gHvAWDoF8yUbYu+gFH9ic5DBNEzHIPutnrYiW vEg+9lD45jZhguJoYil+Q1xCTJ3ga5BH47nPiFrMdoz0nJPGT/F0M/BdhN5WnqI6QIyfHd XtBwk0jfIdEIjRFWON/mq0RZYvjjZyPIWqf7hzgq/1KwLw9RJcbOsgu8lsb3Bw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696610423; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L2YMgFsBueVdIUF+NtJw5K00qkcFw1Ess5WSkvTB5Ao=; b=aWcfFLEa7FE/ET8KerB9PoogkWK88KjvnInnpgsjZpHLSYAZWziZYm0Rv+iHs2vZlWKiof VSnAOexcXYLk/jIKpFTfnHAET9j4q8AOz3NX9q5wvf1zttp8XKOlI6+YyN4ElF7zaZbJY+ VN67W7nChKa4Lm+3umMCYQYvS7N7wgj6M30aee0WJ+0TWklpdHtEpKcRuiAx1MkbjOJxCM YO9A6rk8ODeBcnHTbarvIz/4Ro19iCy2rcspLwm5j+USusrk15Zg/sMrjmGOx7qSTXpEZ7 vOYbC2irPlRJ5wToH6Ccbx0U2ZMeYfl5BOZGHy6mVktGeE74zKk2OmyXmrUbAw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4S2DgW1mPTzvt3; Fri, 6 Oct 2023 16:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 396GeNnU019319; Fri, 6 Oct 2023 16:40:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 396GeNkY019316; Fri, 6 Oct 2023 16:40:23 GMT (envelope-from git) Date: Fri, 6 Oct 2023 16:40:23 GMT Message-Id: <202310061640.396GeNkY019316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: c5e5722220e0 - main - tests: Use ifconfig -j instead of jexec ifconfig. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c5e5722220e091737c70ef4b6571480ad4188fed Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=c5e5722220e091737c70ef4b6571480ad4188fed commit c5e5722220e091737c70ef4b6571480ad4188fed Author: Dag-Erling Smørgrav AuthorDate: 2023-10-06 16:40:07 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-10-06 16:40:07 +0000 tests: Use ifconfig -j instead of jexec ifconfig. Reviewed by: kp, asomers Differential Revision: https://reviews.freebsd.org/D42110 --- tests/sys/common/vnet.subr | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tests/sys/common/vnet.subr b/tests/sys/common/vnet.subr index 50abadaec81d..183f7284d614 100644 --- a/tests/sys/common/vnet.subr +++ b/tests/sys/common/vnet.subr @@ -79,7 +79,7 @@ vnet_ifrename_jail() ifname=$2 ifnewname=$3 - jexec ${jailname} ifconfig $ifname name $ifnewname + ifconfig -j ${jailname} $ifname name $ifnewname sed -i "" "/^${jailname}/s/${ifname}/${ifnewname}/" created_jails.lst } @@ -88,7 +88,7 @@ vnet_cleanup() if [ -f created_jails.lst ]; then while read jailname ifnames; do for ifname in ${ifnames}; do - jexec ${jailname} ifconfig ${ifname} destroy + ifconfig -j ${jailname} ${ifname} destroy done jail -r ${jailname} done < created_jails.lst @@ -96,10 +96,9 @@ vnet_cleanup() fi if [ -f created_interfaces.lst ]; then - for ifname in `cat created_interfaces.lst` - do + while read ifname; do ifconfig ${ifname} destroy - done + done < created_interfaces.lst rm created_interfaces.lst fi }