From nobody Wed Aug 30 12:11:27 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 4RbNSJ13WNz4s3Wn; Wed, 30 Aug 2023 12:11:28 +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 4RbNSJ0YxSz4M5H; Wed, 30 Aug 2023 12:11:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693397488; 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=2oJIKO2DkJNkYJS0hBfICtXhdTHtc6uhqKzfduXDdug=; b=XqJJt1hZ/sAkJQM1OUe5V3d1lIdNqyQERq7jBTZh0J4h2uS7dOI7hOEw3C/8gmZld2BE1Z 6xqWRhqdMHDB75uraM1QvdjWgIKoNZU5kIIi/0bBHacehI2cxNRcRepuARDhkmz+aXXX/P mnjQTcvRGEy4FGdOqSMuEaAxsm+zLCSm/lWQBFnk4aFJ3WGzkDSLnggO6WQHCVGHxkBSV3 ehKVMFxhQu+cj3Bx9/0mPhnYk9jEtEqEq4L/zo1NjX4mf4mIvJkbzQ2xrecmHkzYGwQjR9 tN4HaJGVucUQdDGXOWVSPynf6u7TylJ6DFEtPNo13vxN7s8kY++3wiBuEqyuMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693397488; a=rsa-sha256; cv=none; b=XaFxeUP2tp08EcyPJ/i8CwKyhh46VJ/2Ke03pRDST2T8QouhPDgAPvWAUjJGx5lS2QWRG9 7XBuKUv49lYRvjptEX75MbAFluevkFhxgL8u5+jwRizFmr05B5/iM2jGa17lSs0Bp4fbu7 sTqif6pDMt2LLohm7XBw4zfmetrcNcv6xMQB9Mb5TELmma4Q2i7lzmfs3awm41kXN7asCh gAZoiLCT6m/fGIOmT5G1lXB4OEenvp7brFh7Fac0BKb59GOYCOGVS1ozviVYLxfNuN27pA FV+42o6Bl9VjV9YK+eGGrHHRTKyKK/xjpk580nW/hzO9O/KvMWAIq1KGf6hBxA== 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=1693397488; 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=2oJIKO2DkJNkYJS0hBfICtXhdTHtc6uhqKzfduXDdug=; b=PjsgcTAqGcLw1UANo+QzGfo3NPf0DLLsSE+fSYbUpNegfnrnjvzmA7fNGsEJHR/5kHOB72 /o4v6WATD1Sc09LzbymUoRhmYcAzoJf/sJdwNTEuDkvBFMTK7Fu5KMGtHqKWhp2DCmZGD9 sE9cvNdsn9aluPo4UY+bRkzQjhpOBLCuYIfvamvmaMqa0NFbug+0eSNP3FsafyU23EdkkP 83SGb7UreeT5h35OzOzgWncpiDNwpOTvhQWP+TrZgMUpcIAhUZ1d248qyq1+ARlmD7iL3v z6BNo2gmVm9N0rMTQSi8SGKUueQ2o/aS73MjwryxiJIuR9Gz8mJz0k710OGAJg== 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 4RbNSH6lSVzZ4B; Wed, 30 Aug 2023 12:11:27 +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 37UCBR0W026513; Wed, 30 Aug 2023 12:11:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37UCBRbL026510; Wed, 30 Aug 2023 12:11:27 GMT (envelope-from git) Date: Wed, 30 Aug 2023 12:11:27 GMT Message-Id: <202308301211.37UCBRbL026510@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e8deaa3c6b8b - stable/13 - 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8deaa3c6b8b98f435a07b47aaf3c546e7e876d5 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e8deaa3c6b8b98f435a07b47aaf3c546e7e876d5 commit e8deaa3c6b8b98f435a07b47aaf3c546e7e876d5 Author: Andrew Fengler AuthorDate: 2023-06-26 18:40:21 +0000 Commit: Zhenlei Huang CommitDate: 2023-08-30 12:06:51 +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 (cherry picked from commit f81be7a8318b178e406c12d98f78cfa2a4229af7) --- 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 ae1aa18973db..9b906f69b354 100755 --- a/libexec/rc/rc.d/routing +++ b/libexec/rc/rc.d/routing @@ -170,7 +170,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 @@ -246,8 +246,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