pool/cfengine
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 625201 from home:aeszter:branches:systemsmanagement

Browse Source 
- Fix path to executables for sys variables (BOO #1099946)

OBS-URL: https://build.opensuse.org/request/show/625201
OBS-URL: https://build.opensuse.org/package/show/systemsmanagement/cfengine?expand=0&rev=176
This commit is contained in:
Klaus Kämpf 2018-07-26 15:24:04 +00:00 committed by Git OBS Bridge
parent 883fe94c4f
commit 46d83dfdfe
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
0001-Set-sys.bindir-to-usr-sbin-expect-cf-components-ther.patch
View File

@ -22,7 +22,7 @@ index 5447659da5e1..5715d9acc7b7 100644
- snprintf(workbuf, CF_BUFSIZE, "%s%cbin", workdir, FILE_SEPARATOR); - 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", workbuf, CF_DATA_TYPE_STRING, "source=agent");
+ EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "bindir", "/usr/sbin", CF_DATA_TYPE_STRING, "source=agent"); + EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "bindir", "/usr/bin", CF_DATA_TYPE_STRING, "source=agent");
snprintf(workbuf, CF_BUFSIZE, "%s%cfailsafe.cf", GetInputDir(), FILE_SEPARATOR); 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"); EvalContextVariablePutSpecial(ctx, SPECIAL_SCOPE_SYS, "failsafe_policy_path", workbuf, CF_DATA_TYPE_STRING, "source=agent");
@ -31,7 +31,7 @@ index 5447659da5e1..5715d9acc7b7 100644
} }
#else #else
- snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[i]); - 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]); + snprintf(name, CF_MAXVARSIZE - 1, "/usr/bin/%s", components[i]);
#endif #endif
have_component[i] = false; have_component[i] = false;
@ -40,7 +40,7 @@ index 5447659da5e1..5715d9acc7b7 100644
components[1]); components[1]);
#else #else
- snprintf(name, CF_MAXVARSIZE - 1, "%s%cbin%c%s", workdir, FILE_SEPARATOR, FILE_SEPARATOR, components[1]); - 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]); + snprintf(name, CF_MAXVARSIZE - 1, "/usr/bin/%s", components[1]);
#endif #endif
if (stat(name, &sb) != -1) if (stat(name, &sb) != -1)

5
cfengine.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Jul 25 07:29:51 UTC 2018 - aeszter@gwdg.de
- Fix path to executables for sys variables (BOO #1099946)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 3 07:30:21 UTC 2018 - kkaempf@suse.com Tue Jul 3 07:30:21 UTC 2018 - kkaempf@suse.com