From e6633005fff7c3f9d4428d515401596c14b0e809 Mon Sep 17 00:00:00 2001 From: Lars Erik Wik Date: Mon, 20 Apr 2026 16:57:28 +0200 Subject: [PATCH 1/2] standard_services bundle now invokes systemctl without --global The call_systemctl command in the systemd_services bundle passed both --global and --system to systemctl. These flags are mutually exclusive: --global operates on the global user configuration (affecting all users' systemd --user instances), while --system operates on the system manager. Passing both causes systemctl to fail with an error about conflicting options, breaking the default standard_services bundle. Since standard_services manages system services, --system is the correct scope; --global has been removed. Ticket: CFE-4639 Changelog: Title Signed-off-by: Lars Erik Wik (cherry picked from commit 052bb8e9aad8a8cab136b283be856a591681b953) --- lib/services.cf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/services.cf b/lib/services.cf index b505b16924..d2876bfc1d 100644 --- a/lib/services.cf +++ b/lib/services.cf @@ -369,7 +369,7 @@ bundle agent systemd_services(service,state) vars: systemd:: "call_systemctl" - string => "$(paths.systemctl) --no-ask-password --global --system"; + string => "$(paths.systemctl) --no-ask-password --system"; "systemd_properties" string => "-pLoadState,CanStop,UnitFileState,ActiveState,LoadState,CanStart,CanReload"; From 9ba056e3f12d25bbc2548dac5eab31ab866ecd29 Mon Sep 17 00:00:00 2001 From: Nick Anderson Date: Fri, 24 Apr 2026 12:55:00 -0500 Subject: [PATCH 2/2] Added changelog entry Added with the PR so that if it's not merged, the chagelog isn't stale with a missing entry --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 74a239da4f..7595c35c12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,8 @@ - Fixed maximum recursion errors in modules_presence for CFEngine versions unaffected by CFE-4623 (CFE-2852) - Added dnf_group package module for managing DNF package groups (CFE-2852) +- standard_services bundle no longer invokes `systemctl` with `--global` + with is mutually exclusive from `--system` (CFE-4639) ## 3.24.3