aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Leidinger <netchild@FreeBSD.org>2026-06-27 13:44:33 +0000
committerAlexander Leidinger <netchild@FreeBSD.org>2026-06-27 13:52:08 +0000
commitd05d60e958bca778ea193932facb026c48d7ca0b (patch)
treef29285f5495df59c3f74df1b24475ae614510923
parent968e748c439a50ad0a1a4463f4753f58a2bdaf9f (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
-rwxr-xr-xlibexec/rc/rc.d/lockd3
-rwxr-xr-xlibexec/rc/rc.d/statd3
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