diff options
| author | Alexander Leidinger <netchild@FreeBSD.org> | 2026-06-27 13:44:33 +0000 |
|---|---|---|
| committer | Alexander Leidinger <netchild@FreeBSD.org> | 2026-07-27 09:39:27 +0000 |
| commit | d85e97c16f0340df686acdb3b71f4eaf1049ab98 (patch) | |
| tree | 9f171a2cd1b5572a6f79ddb7875cddf5d679c689 | |
| parent | 49233a1fce025a32cbe790d4c0091b68292d30a6 (diff) | |
rc.d: fix lockd and statd flags processing after scvj
The documented flags are named differently than the script name, this
requires special handling of the flags.
The Service Jails feature requires the handling of the variable to be
differently than it was initially. The change back then did not work,
which resulted in the flags to be ignored.
This commit fixes the issue in head. This affects 15.0 and 15.1 too.
PR: 296233
Reported by: Robert Blayzor <rblayzor@inoc.net>
Tested by: Robert Blayzor <rblayzor@inoc.net>
Fixes: f99f0ee14e3af81c2 - rc.d: add a service jails config to all base system services
MFC after: 1 month
MFC to: 15-stable
(cherry picked from commit d05d60e958bca778ea193932facb026c48d7ca0b)
| -rwxr-xr-x | libexec/rc/rc.d/lockd | 3 | ||||
| -rwxr-xr-x | libexec/rc/rc.d/statd | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/libexec/rc/rc.d/lockd b/libexec/rc/rc.d/lockd index 9c804751031a..ae7515d7bf5f 100755 --- a/libexec/rc/rc.d/lockd +++ b/libexec/rc/rc.d/lockd @@ -29,6 +29,7 @@ lockd_precmd() load_rc_config $name -rc_flags=${rpc_lockd_flags} +: ${lockd_flags:="${rpc_lockd_flags}"} +export lockd_flags run_rc_command $1 diff --git a/libexec/rc/rc.d/statd b/libexec/rc/rc.d/statd index 3f2678af2940..e257200552a2 100755 --- a/libexec/rc/rc.d/statd +++ b/libexec/rc/rc.d/statd @@ -28,6 +28,7 @@ statd_precmd() load_rc_config $name -rc_flags=${rpc_statd_flags} +: ${statd_flags:="${rpc_statd_flags}"} +export statd_flags run_rc_command $1 |