From nobody Mon Jun 26 18:44:33 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 4QqcFs2HV5z4kD3J; Mon, 26 Jun 2023 18:44:33 +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 4QqcFs1mWpz4FS5; Mon, 26 Jun 2023 18:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687805073; 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=Ht3QpbnCaIJDvyhTM/2yAiez/91FVhBLjE38h5HpEOo=; b=qUEdwS4j590bJTEXAHlYj2ZdVUNyUEJmuhHGNON1fn92dGNr32drpBG2GbrgvLKckUeLq+ khRkDyfV+XI1qMc65phsb+Yl4PxWUwcrQcZONRMON4+ULOvMaqYv4JxgYE2l5yn5b5zPws yl30FnCRkL996l71a6m2tFzYwFKoEQpObOksSYxAvNqFhdt2btNREJGuTYXio5U08X/xc1 V8maCVJBfx1K5z+WVXnMYtxaWQgbrOEKWLw406x8MEteGBqHcs877Nluhri0KpsoBEkBvm Fcc37pBjZQWdH8ili5MbqzNK6mYkThHNPsRGLl8scz0/wCAtz6+1HSEZ0dCQZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687805073; 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=Ht3QpbnCaIJDvyhTM/2yAiez/91FVhBLjE38h5HpEOo=; b=aYNU8zPGQG2ierFAIWTodhD9qZdKXU2gubM6kgKk9x8+Qjl6zoZwznyqi+x5lQmZ6U9D3c +BGs0QnMdH/8Y2Clbyz30m5aY4VK3XJfiNkJ41j+YlK2J13r5SlhChGNHAl+xcinDWC3a8 TIJJa6JnRmegHXV4xpNO4vxU9fcW3fGuQX0+dt7PlxqIH9sTrt9LggBwQsb2GPq9/QQoSW 2mhBDjzI7e1Tjoi8NG3lzm/znGTf3Owu5f0CwhTdBi8GvqBGvmR/W+xbNnXBpuaWSTzs6W 0ekMclFUfeFX5Q03AWKHzpZ0nf677Y1DXLpiOAuUVsGmQBapwkrSlK6mtTdL3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687805073; a=rsa-sha256; cv=none; b=TWqiPwaf8yBddk1qK9hVt7BjbpAvKyNID9nixiZchS64uN5YNZJgQ5TiAFLOnXBq1AQzjH SruhlrZgBL/heQuYFGpwluEDI39D3nWNeubRvncMlBxyoCht+w2phYhUYLRug5xKGX7Aco +WmVWawNotHIPoiJoVcjrUR8xXw/YfXQVqHm1gsTolKtSXSWH+gzlg/drVOSDTR9sWFmxN IKfIKfgQZCaDhUPxmxHnCfn1CQu7zWW7iifTiyL1dWMmuOSHI3StW0D5X3uWoie1f2auGS tcDVh7CZfjD9F1eAdRidon6BcWFklnaMD5HaXv8SnQwZeXEMpTFLz1mZC9n/Ng== 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 4QqcFs0pz8zLn8; Mon, 26 Jun 2023 18:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35QIiXkT047212; Mon, 26 Jun 2023 18:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35QIiXot047211; Mon, 26 Jun 2023 18:44:33 GMT (envelope-from git) Date: Mon, 26 Jun 2023 18:44:33 GMT Message-Id: <202306261844.35QIiXot047211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Allan Jude Subject: git: f81be7a8318b - main - rc.d/routing: Correct setting default gateway for each FIB 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: allanjude X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f81be7a8318b178e406c12d98f78cfa2a4229af7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by allanjude: URL: https://cgit.FreeBSD.org/src/commit/?id=f81be7a8318b178e406c12d98f78cfa2a4229af7 commit f81be7a8318b178e406c12d98f78cfa2a4229af7 Author: Andrew Fengler AuthorDate: 2023-06-26 18:40:21 +0000 Commit: Allan Jude CommitDate: 2023-06-26 18:43:46 +0000 rc.d/routing: Correct setting default gateway for each FIB There was a mistake in the previous commit, it used the incorrect spelling of the FIB variable name and was not functional Also corrects an issue with the IPv6 default route variable name. Fixes: 30659d1dcbcc ("Add support for adding default routes for other FIBs") Sponsored-by: ScaleEngine Inc. Differential Revision: https://reviews.freebsd.org/D37685 --- libexec/rc/rc.d/routing | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libexec/rc/rc.d/routing b/libexec/rc/rc.d/routing index 37b3da0f0cef..2f6500938e6a 100755 --- a/libexec/rc/rc.d/routing +++ b/libexec/rc/rc.d/routing @@ -171,7 +171,7 @@ static_inet() ;; *) static_routes="${static_routes} _default_fib${_fibnum}" - eval route__default_fib${fibnum}="'default ${_fib_gw} -fib ${_fibnum}'" + eval route__default_fib${_fibnum}="'default ${_fib_gw} -fib ${_fibnum}'" ;; esac done @@ -247,8 +247,8 @@ static_inet6() [Nn][Oo] | '') ;; *) - ipv6_static_routes="${static_routes} _default_fib${_fibnum}" - eval ipv6_route__default_fib${fibnum}="'default ${_fib_gw} -fib ${_fibnum}'" + ipv6_static_routes="${ipv6_static_routes} _default_fib${_fibnum}" + eval ipv6_route__default_fib${_fibnum}="'default ${_fib_gw} -fib ${_fibnum}'" ;; esac done