From nobody Tue Feb 11 13:48:53 2025 X-Original-To: dev-commits-src-branches@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 4YsjTd5dR2z5nby7; Tue, 11 Feb 2025 13:48:53 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YsjTd4KL5z45yS; Tue, 11 Feb 2025 13:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739281733; 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=iRDjIIKKFJ6QBt/lNk/xIXwS8eVouFDUi7L1AXtbLfo=; b=YYIuyBMMjfTtnBVIyvarHXjmS+IFbZk4cG+RhvXzqrEeVj5MWcfTys8IcKal0CmjNs4U8F A14vWB9RgXxOoyYXyFLJq7WypwIMydRCkcf5mbhVze/cGMCuBjNj6Jt3x7MXZoatwt8EO3 NC9uYuev5FaBeRzWn7vEBWm1iVGWLZWjE0Fe4i5lH93Czarmim7ijLrkq6mE+D2ddVFiJ1 bNY+YwnBepAjI6kEuB1O3/zhpGZKtc6LqHwnZP3qhII+LuddjmPPLq2yrmP+6MKyPxnSVJ CMG7TrypOvWmKe1h7Al/ktLC+WmiktGC8xjuMJihVX50UIg7dhqDCYfPoGuXTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1739281733; 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=iRDjIIKKFJ6QBt/lNk/xIXwS8eVouFDUi7L1AXtbLfo=; b=THezhBNvyBq3YroatgTqkgAaTaJgZrkrPIVP+kTMkgHCKS7pggSuFWZF1lmeS6XOpiU/tk YGG4fjdKGn6k43e5/ros7svp+INOomBMWDcdF9NjXTrwEWAlWd7bTk+i5ymYetlBdKIEjx sNb1xiGMmwqbce0uyzUWYD8zsD8eYJfD5v/z29sfEYZ+9DqKiYi0qv/yXw81c0c1MeTRx5 R4Q7cyDizk4UOUCUefwA8GX/HTDvByqUsSQFRQFKGF8EOJ48qoqxOuFaYWT8gnJWhRUi24 pE+ooj7l7N8Qe1qxLK2/54ruGTXFxd5ajfSVtqFKJgis+QP3oXkoyZFMsf2epQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1739281733; a=rsa-sha256; cv=none; b=uN8A8B0b4IWRuJIq66+FjrP+ixQ9/iedbwQaZ6+W1FLa165yVM7KuhyoJtLrhTHj2r+YGb 9CXUUgXW+2hyQyScoLCi91TzubOQc1tDvINMBCFjYcy1EjmfXOhTxBY9tiz7DdRtkniY4a EaQmNwwUYHlS9OzyV1UmPTwXaB0PmDTvfwRyQjAtA7g56zfW2erHQhrqbi3uX+Birb1tci zg9Qf7b4fPOeLuUNb0QzIpn6/EPqTtmo/60egMFSGVN0Q7mHRPbX8xnYhNMPW0TvBzs8or cY12oP5TosPlzC6ScVDgr94jyqWp6JtxN8DnoXTm81z1TN4ZcOQMeezAR1hTXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YsjTd3YPWzhm; Tue, 11 Feb 2025 13:48:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 51BDmr8q003220; Tue, 11 Feb 2025 13:48:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 51BDmrqn003217; Tue, 11 Feb 2025 13:48:53 GMT (envelope-from git) Date: Tue, 11 Feb 2025 13:48:53 GMT Message-Id: <202502111348.51BDmrqn003217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Juraj Lutter Subject: git: c204fdb1c859 - stable/13 - periodic: set _localbase for periodic scripts from within periodic.conf List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: otis X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c204fdb1c859847ff972acdcadf6002759038e11 Auto-Submitted: auto-generated The branch stable/13 has been updated by otis: URL: https://cgit.FreeBSD.org/src/commit/?id=c204fdb1c859847ff972acdcadf6002759038e11 commit c204fdb1c859847ff972acdcadf6002759038e11 Author: Juraj Lutter AuthorDate: 2024-11-08 13:38:19 +0000 Commit: Juraj Lutter CommitDate: 2025-02-11 13:48:14 +0000 periodic: set _localbase for periodic scripts from within periodic.conf Set _localbase variable from within /etc/defaults/periodic.conf for use by periodic scripts. This fixes e5d7100c09, no other functional changes intended. Reported by: gahr, otis Reviewed by: markj, gahr MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47486 (cherry picked from commit c8b89c11a1181e900acb638cfde7a55e92553175) --- usr.sbin/periodic/periodic.conf | 9 +++++++++ usr.sbin/periodic/periodic.sh | 12 ++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/usr.sbin/periodic/periodic.conf b/usr.sbin/periodic/periodic.conf index 088e3c612e70..36b3ff5b0070 100644 --- a/usr.sbin/periodic/periodic.conf +++ b/usr.sbin/periodic/periodic.conf @@ -15,6 +15,15 @@ # # +_set_localbase() { + _localbase=`/sbin/sysctl -n user.localbase 2> /dev/null` + # Set default value of _localbase if not previously set + : ${_localbase:="/usr/local"} +} + +# Set _localbase with fallback to /usr/local +_set_localbase + # What files override these defaults ? periodic_conf_files="/etc/periodic.conf /etc/periodic.conf.local ${_localbase}/etc/periodic.conf" diff --git a/usr.sbin/periodic/periodic.sh b/usr.sbin/periodic/periodic.sh index a45d6af73691..0a78a930b4b6 100644 --- a/usr.sbin/periodic/periodic.sh +++ b/usr.sbin/periodic/periodic.sh @@ -29,14 +29,6 @@ if [ $# -lt 1 ] ; then usage fi -_localbase=`/sbin/sysctl -n user.localbase 2> /dev/null` -# Set default value of _localbase if not previously set -: ${_localbase:="/usr/local"} - -# Use a deterministic path to match the preset from /etc/crontab in case -# periodic is run interactively. -export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${_localbase}/sbin:${_localbase}/bin - # If possible, check the global system configuration file, # to see if there are additional dirs to check if [ -r /etc/defaults/periodic.conf ]; then @@ -44,6 +36,10 @@ if [ -r /etc/defaults/periodic.conf ]; then source_periodic_confs fi +# Use a deterministic path to match the preset from /etc/crontab in case +# periodic is run interactively. +export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${_localbase}/sbin:${_localbase}/bin + host=`hostname` export host