SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add utility function to append root to path

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2014-07-26 15:08:42 -04:00
parent 60731f32f1
commit 0c6ea3a4e2
6 changed files with 57 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/systemctl/systemctl.c
+4 -10
View File
@@ -4998,11 +4998,8 @@ static int enable_sysv_units(const char *verb, char **args) {
STRV_FOREACH(k, paths.unit_path) {
_cleanup_free_ char *path = NULL;
if (!isempty(arg_root))
j = asprintf(&path, "%s/%s/%s", arg_root, *k, name);
else
j = asprintf(&path, "%s/%s", *k, name);
if (j < 0)
path = path_join(arg_root, *k, name);
if (!path)
return log_oom();
found_native = access(path, F_OK) >= 0;
@@ -5013,11 +5010,8 @@ static int enable_sysv_units(const char *verb, char **args) {
if (found_native)
continue;
if (!isempty(arg_root))
j = asprintf(&p, "%s/" SYSTEM_SYSVINIT_PATH "/%s", arg_root, name);
else
j = asprintf(&p, SYSTEM_SYSVINIT_PATH "/%s", name);
if (j < 0)
p = path_join(arg_root, SYSTEM_SYSVINIT_PATH, name);
if (!p)
return log_oom();
p[strlen(p) - strlen(".service")] = 0;