From nobody Fri Jul 7 22:26:02 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 4QySfL5lgnz4l5HV; Fri, 7 Jul 2023 22:26:02 +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 4QySfL5L2Hz3MBg; Fri, 7 Jul 2023 22:26:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688768762; 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=FAUbhgd7y7rSam9M/qC1hVGa4yprq4TYvOBJs3+AFzs=; b=aVF1GzwjtXdhczcbQurkWOxyvWs0icNkNAbMrbBCIUzTWD8j0kXaU7xoPeFMA98KhsQSWv S/Dsxvc/QPChMJmjAS7SH4qXBr2h8DKPs7Q4fdzu6FOb1aYCwGy0XuI82W9EgWLVmdTO9B 4SolDEVQ6Ft2fwDvRVVMIyO9hgmX6CaJ8OQ7cyVVKuctsWvuMG4mGUjwjHHQZlYe1YiKn0 UYuX1TcSwy7bnem5UD4KiYzW569N9ViTMofu4+Hif5o+fuK2bS07D83f8rVk5kQLS6rfLj C2jVvkMFpx8bN2vZJTl+4u4a9eAFkko6UnODIy1+eSuy9RmPDlWB0AMv3y5S9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688768762; 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=FAUbhgd7y7rSam9M/qC1hVGa4yprq4TYvOBJs3+AFzs=; b=fMBg29ney5M//alP95AlD4zEw8wf9lNzZUt0lZXBdgydGvGZcAGxtXcHg191/lOiulTVmi fNJGiCIzm3OfaHwtOfo6/7mBIqPZwZ4eg+FVd0a3mciSB4txHydQh33VWsLYY1yyN5dceH nXfvS4a4v+Ex2bWUk1hcgNxP68lV/D+bHCxlti5G/AbBfMPckqnZJX9sIYG/iTuz+WnFYD oYg4mVSmVczkhhu2HYWRx1qkhhs7s1vmKeRqayAOkzieVQ06PLGCjZirdu/BU+Npqw9mHz Fs8lUPkucXgJI5u+O4v7djA77GS21oi/evop0FRP+UmCeg+mJApLz6f2FYUOkA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688768762; a=rsa-sha256; cv=none; b=vrsr4SusWuchzd7yf1EM8r/Gcs6WoVc26our/Szqb41NwOO8XJ9vEWOMOrYMtB1v8KOnjP /vf4/pZDOdRv59/blBwRQi2pF5T+56QPcqFH0qP8ar1O+vvrPoR/QaMMl0DjiUp+TKhHZK eBZrLf5v0mHHLHM3lCfGKbW1SXrVRKwQZJ03cqp8BREBV5PEzTalS76b7UF7U/XRSyDr+G E5SJ3bFZwUgePEf18ohUE7H7M4axKjNBavnuAPeV3pAMwpgES+Wux8suc9LBU3PVb2/M4e Qofh1eRaokNtALnclbE68R4tgybtSHS8kod7J9sR+J1ddoyPXpCcKl4I19RHYA== 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 4QySfL4PCGzwNs; Fri, 7 Jul 2023 22:26:02 +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 367MQ2f3061860; Fri, 7 Jul 2023 22:26:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 367MQ2hK061859; Fri, 7 Jul 2023 22:26:02 GMT (envelope-from git) Date: Fri, 7 Jul 2023 22:26:02 GMT Message-Id: <202307072226.367MQ2hK061859@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: f55ef85748e4 - main - etc/rc.d/routing: use find_system_scripts 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: brooks X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f55ef85748e48f5d70c3dbff7af1567076c79a1e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f55ef85748e48f5d70c3dbff7af1567076c79a1e commit f55ef85748e48f5d70c3dbff7af1567076c79a1e Author: Brooks Davis AuthorDate: 2023-07-07 22:25:11 +0000 Commit: Brooks Davis CommitDate: 2023-07-07 22:25:11 +0000 etc/rc.d/routing: use find_system_scripts In 3693d9140e05aba9942232df13468f51a6cde136 /etc/rc switched to using find_system_scripts rather than directly including /etc/rc.d/* in the list of scripts to run in order to skip .pkgsave files. Follow suit in etc/rc.d/routing. Sponsored by: DARPA --- libexec/rc/rc.d/routing | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/routing b/libexec/rc/rc.d/routing index 2f6500938e6a..6faddd553ddd 100755 --- a/libexec/rc/rc.d/routing +++ b/libexec/rc/rc.d/routing @@ -336,8 +336,9 @@ _check_dynamicrouting() skip="$skip -s nojail" fi [ -n "$local_startup" ] && find_local_scripts_new + [ -n "$system_rc" ] && find_system_scripts - for file in $( rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null | + for file in $( rcorder ${skip} ${system_rc} ${local_rc} 2>/dev/null | xargs grep -lE '^# PROVIDE:.*\' ); do (set -- enabled; . $file) && return 0; done