19b8c826db
See https://github.com/cfengine/core/blob/3.7.x/ChangeLog for full changelog New features: - New package promise implementation. The syntax is much simpler, to try it out, check out the syntax: packages: "mypackage" policy => "absent/present", # Optional, default taken from common control package_module => apt_get, # Optional, will only match exact version. May be # "latest". version => "32.0", # Optional. architecture => "x86_64"; - Full systemd support for all relevant platforms - New classes to determine whether certain features are enabled: * feature_yaml * feature_xml For the official CFEngine packages, these are always enabled, but packages from other sources may be built without the support. - New readdata() support for generic data input (CSV, YAML, JSON, or auto) - YAML support: new readyaml() function and in readdata() - CSV support: new readcsv() function and in readdata() - New string_mustache() function - New data_regextract() function - eval() can now be called with "class" as the "mode" argument, which will cause it to return true ("any") if the calculated result is non-zero, and false ("!any") if it is zero. OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=131
50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
From 900148bcea077497d062eccb7a8a5f1ea6f4f9e0 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
|
Date: Thu, 30 Jul 2015 10:48:47 +0200
|
|
Subject: [PATCH 1/2] Set sys.bindir to /usr/sbin, expect cf-*components there
|
|
|
|
That's where the /var/cfengine/bin/* symlinks point to and where
|
|
the systemd .service files expect the daemons.
|
|
|
|
This path is used in 'processes' of
|
|
masterfiles/update/update_processes.cf:enable_cfengine_agents
|
|
---
|
|
libenv/sysinfo.c | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/libenv/sysinfo.c b/libenv/sysinfo.c
|
|
index a75c6aa1d8d6..1c1139aead94 100644
|
|
--- a/libenv/sysinfo.c
|
|
+++ b/libenv/sysinfo.c
|
|
@@ -581,8 +581,7 @@ static void GetNameInfo3(EvalContext *ctx)
|
|
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "masterdir", GetMasterDir(), CF_DATA_TYPE_STRING, "source=agent");
|
|
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "inputdir", GetInputDir(), CF_DATA_TYPE_STRING, "source=agent");
|
|
|
|
- snprintf(workbuf, CF_BUFSIZE, "%s%cbin", workdir, FILE_SEPARATOR);
|
|
- EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "bindir", workbuf, CF_DATA_TYPE_STRING, "source=agent");
|
|
+ EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "bindir", "/usr/sbin", CF_DATA_TYPE_STRING, "source=agent");
|
|
|
|
snprintf(workbuf, CF_BUFSIZE, "%s%cfailsafe.cf", GetInputDir(), FILE_SEPARATOR);
|
|
EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "failsafe_policy_path", workbuf, CF_DATA_TYPE_STRING, "source=agent");
|
|
@@ -627,7 +626,7 @@ static void GetNameInfo3(EvalContext *ctx)
|
|
components[i]);
|
|
}
|
|
#else
|
|
- snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[i]);
|
|
+ snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[i]);
|
|
#endif
|
|
|
|
have_component[i] = false;
|
|
@@ -650,7 +649,7 @@ static void GetNameInfo3(EvalContext *ctx)
|
|
snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s.exe", workdir, FILE_SEPARATOR, FILE_SEPARATOR,
|
|
components[1]);
|
|
#else
|
|
- snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[1]);
|
|
+ snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[1]);
|
|
#endif
|
|
|
|
if (stat(name, &sb) != -1)
|
|
--
|
|
2.1.4
|
|
|