f5ad403587
New features:
- Introduced Solaris and AIX support into the 3.6 series, with
many associated build and bug fixes.
Changes:
- Short-circuit evaluation of classes promises if class is already
set (Redmine #5241)
- fix to assume all non-specified return codes are failed in
commands promises (Redmine #5986)
- cf-serverd logs reconfiguration message to NOTICE (was INFO)
so that it's always logged in syslog
Bug fixes:
- File monitoring has been completely rewritten (changes attribute
in files promise), which eliminates many bugs, particularly
regarding files that are deleted. Upgrading will keep all
monitoring data, but downgrading again will reinitialize the DB,
so all files will be reported as if they were new. (Redmine #2917)
- $(this.promiser) expands in files promises for 'transformer',
'edit_template', 'copy_from.source', 'file_select.exec_program',
'classes' and 'action' bodies (Redmine #1554, #1496, #3530, #1563)
- 'body changes' notifies about disappeared files in file monitoring
(Redmine #2917)
- Set not-kept classes when files or commands promise should be
repaired, but is warn-only (Redmine #2359)
- Fixed CFEngine template producing a zero-sized file (Redmine #6088)
- Add 0-9 A-Z _ to allowed context of module protocol (Redmine #6063)
- Extend ps command column width on Solaris and filter on zone
rather than adding it to the ps output.
- Fixed strftime() function on Solaris when called with certain
specifiers.
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=101
50 lines
2.3 KiB
Diff
50 lines
2.3 KiB
Diff
From 7b0a005250c0398b86ea5adf93c16b5c8735a343 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Klaus=20K=C3=A4mpf?= <kkaempf@suse.de>
|
|
Date: Fri, 2 May 2014 12:47:37 +0200
|
|
Subject: [PATCH 2/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 f8ffd67b7a49..96d6c9336441 100644
|
|
--- a/libenv/sysinfo.c
|
|
+++ b/libenv/sysinfo.c
|
|
@@ -566,8 +566,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", CFWORKDIR, 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");
|
|
@@ -612,7 +611,7 @@ static void GetNameInfo3(EvalContext *ctx)
|
|
components[i]);
|
|
}
|
|
#else
|
|
- snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", CFWORKDIR, FILE_SEPARATOR, FILE_SEPARATOR, components[i]);
|
|
+ snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[i]);
|
|
#endif
|
|
|
|
have_component[i] = false;
|
|
@@ -635,7 +634,7 @@ static void GetNameInfo3(EvalContext *ctx)
|
|
snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s.exe", CFWORKDIR, FILE_SEPARATOR, FILE_SEPARATOR,
|
|
components[1]);
|
|
#else
|
|
- snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", CFWORKDIR, FILE_SEPARATOR, FILE_SEPARATOR, components[1]);
|
|
+ snprintf(name, CF_MAXVARSIZE - 1, "/usr/sbin/%s", components[1]);
|
|
#endif
|
|
|
|
if (stat(name, &sb) != -1)
|
|
--
|
|
1.8.4.5
|
|
|