From nobody Mon Jun 19 17:46:05 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 4QlHHf1vh6z4g091; Mon, 19 Jun 2023 17:46:06 +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 4QlHHf1QW9z3K38; Mon, 19 Jun 2023 17:46:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196766; 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=A4BvkBSY+eh9C4rlvWRYwXsPVvg3E60Ua7sG3pBBRUw=; b=KI52TetY1eDG4HJejhxZMZfERWx/P63YXT3iMwm5w73yWrPFZgdI46l8FXFwRLKXtkjmbm B9J4exZZJhJ8UlPZionU/faxWD74eJilHkkZgemQ4AQNkqepRkl4AWATevnbN0AgcmRSCB 56zsTvj/vihHdB57Ig4X7mS/LkEJAt/TtcJ4PVMT3bXoKqJjxC5/NoE9pLnQI0vTt3QBD8 1i5vamXNZgYLd+H3E7J92fPn0dLYPX6p2ZMFitVtGJkpd0NdKSrVL7gzOnta2koiQ+hT72 uv1Xbd2NrAIsUMH0rief30eXBE7Euq+soRkH/gusjpC9o2V0hiHckH9WU1/E/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687196766; 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=A4BvkBSY+eh9C4rlvWRYwXsPVvg3E60Ua7sG3pBBRUw=; b=cyD9XuXAEB5NjZVsYfd8G6ktAhugjT0nDmbxIBvjabYyocITOLEoXTR9E69+ZRbU3mxmiW ILx+Cc/F5Jmpr2utxyIq7godzmyOsLVRE9+5Nu3qFB++CnFujffpfOU9msEur/0l52MygB hMdeykWvPaNKtXs1ITqE8c/RK5uWa+CUGeoXdR0aBNN8j51/FNX0EB1GbIo1lP/RMWGRQ8 N/ESXiZON9X5gwVz/S/KMA+4waXCoZORFBXe3DlkehuFbQ+vrRRY89OLznixATQQdv5HAQ S7lNBVhYfxKExCJkwANweYlobJK26O3MpeQnSMFbW9vO4cju2dbzZWyFtUpdmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687196766; a=rsa-sha256; cv=none; b=ugv/Au7j9Snr5PKyTf5w13gMJxBoUVfIpfIp2DQFHgY+JVleUMYr1/FZur9Wv1R35UnNF7 hlplM5gGrorvQWqGORrG25W96g+6gU57OPiESkvU5s5TOWPueq99Xv/3tJvTYBoxz4IdFG if3ZFQK/2t1nzIC46jzFvqcYj5nj+jO9n0GtoLX5SLLWV1ry755Dtag+h0RzRu7E+tnZ0b b6CtA/ISimNOiwNrmMsk6cakcd4xIXwv6OPx5ZotJp5JZd/bKfga5YHl71kyrJU1HLH+Gg xC116tTmJigxEQ4on3ZsgJsb2duMx/y2eGwR0MIlB4/+MP3rT1fw2ZyFF1Wxfg== 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 4QlHHf0KkTzRWq; Mon, 19 Jun 2023 17:46:06 +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 35JHk5Ye097563; Mon, 19 Jun 2023 17:46:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JHk5sV097562; Mon, 19 Jun 2023 17:46:05 GMT (envelope-from git) Date: Mon, 19 Jun 2023 17:46:05 GMT Message-Id: <202306191746.35JHk5sV097562@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alexander Leidinger Subject: git: 194e059bb803 - main - service: Add -E option to set environment variables before starting a service. 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: netchild X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 194e059bb80334e6f4f791a186015b20d7f6f4b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by netchild: URL: https://cgit.FreeBSD.org/src/commit/?id=194e059bb80334e6f4f791a186015b20d7f6f4b8 commit 194e059bb80334e6f4f791a186015b20d7f6f4b8 Author: Alexander Leidinger AuthorDate: 2022-11-30 18:31:41 +0000 Commit: Alexander Leidinger CommitDate: 2023-06-19 17:45:54 +0000 service: Add -E option to set environment variables before starting a service. This allows for quicker testing/debugging of rc scripts and is a pre-req for automatic service jails. Differential Revision: https://reviews.freebsd.org/D40369 Reviewed by: se --- usr.sbin/service/service.8 | 12 ++++++++++++ usr.sbin/service/service.sh | 23 ++++++++++++++--------- 2 files changed, 26 insertions(+), 9 deletions(-) diff --git a/usr.sbin/service/service.8 b/usr.sbin/service/service.8 index 9902ae3c8574..c2be0e0af037 100644 --- a/usr.sbin/service/service.8 +++ b/usr.sbin/service/service.8 @@ -48,6 +48,7 @@ .Nm .Op Fl j Ar jail .Op Fl v +.Op Fl E Ar var=value .Ar script .Ar command .Sh DESCRIPTION @@ -67,6 +68,13 @@ the scripts using various criteria. .Pp The options are as follows: .Bl -tag -width F1 +.It Fl E Ar var=value +Set the environment variable +.Ar var +to the specified +.Ar value +before starting the script. +This option can be used multiple times. .It Fl e List services that are enabled. The list of scripts to check is compiled using @@ -117,6 +125,9 @@ to which is how they are set in .Pa /etc/rc at boot time. +If the +.Fl E +option is used, the corresponding variable is set accordingly. .Sh EXIT STATUS .Ex -std .Sh EXAMPLES @@ -126,6 +137,7 @@ command: .Bd -literal -offset -ident service named status service -j dns named status +service -E LC_ALL=C.UTF-8 named start service -rv .Ed .Pp diff --git a/usr.sbin/service/service.sh b/usr.sbin/service/service.sh index f056c43d3c98..5f232955bdff 100755 --- a/usr.sbin/service/service.sh +++ b/usr.sbin/service/service.sh @@ -37,21 +37,23 @@ usage () { echo "${0##*/} [-j ] -e" echo "${0##*/} [-j ] -R" echo "${0##*/} [-j ] [-v] -l | -r" - echo "${0##*/} [-j ] [-v] start|stop|etc." + echo "${0##*/} [-j ] [-v] [-E var=value] start|stop|etc." echo "${0##*/} -h" echo '' - echo "-j Perform actions within the named jail" - echo '-e Show services that are enabled' - echo "-R Stop and start enabled $local_startup services" - echo "-l List all scripts in /etc/rc.d and $local_startup" - echo '-r Show the results of boot time rcorder' - echo '-v Verbose' + echo "-j Perform actions within the named jail" + echo "-E n=val Set variable n to val before executing the rc.d script" + echo '-e Show services that are enabled' + echo "-R Stop and start enabled $local_startup services" + echo "-l List all scripts in /etc/rc.d and $local_startup" + echo '-r Show the results of boot time rcorder' + echo '-v Verbose' echo '' } -while getopts 'j:ehlrRv' COMMAND_LINE_ARGUMENT ; do +while getopts 'j:E:ehlrRv' COMMAND_LINE_ARGUMENT ; do case "${COMMAND_LINE_ARGUMENT}" in j) JAIL="${OPTARG}" ;; + E) VARS="${VARS} ${OPTARG}" ;; e) ENABLED=eopt ;; h) usage ; exit 0 ;; l) LIST=lopt ;; @@ -72,6 +74,9 @@ if [ -n "${JAIL}" ]; then [ -n "${RCORDER}" ] && args="${args} -r" [ -n "${RESTART}" ] && args="${args} -R" [ -n "${VERBOSE}" ] && args="${args} -v" + for var in ${VARS}; do + args="${args} -E ${var}" + done # Call jexec(8) with the rebuild args and any positional args that # were left in $@ @@ -171,7 +176,7 @@ cd / for dir in /etc/rc.d $local_startup; do if [ -x "$dir/$script" ]; then [ -n "$VERBOSE" ] && echo "$script is located in $dir" - exec env -i -L -/daemon HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin "$dir/$script" "$@" + exec env -i -L -/daemon HOME=/ PATH=/sbin:/bin:/usr/sbin:/usr/bin ${VARS} "$dir/$script" "$@" fi done