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

portable: make use of the new unit file path

Browse Source 
Note that this breaks compatibility with older versions, as the detach
code won't find unit files attached with older releases anymore. But
given that the portable service logic was not deemed stable so far, and
this was explicitly documented and enforced through portablectl's
installation to /usr/lib/systemd/ such a compat breakage should be fine.
This commit is contained in:
Lennart Poettering
2018-10-08 18:49:45 +02:00
parent 0cd4628de9
commit 40a7b232de
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/portable/portable.c
+6 -6
View File
@@ -815,15 +815,15 @@ static int install_profile_dropin(
return 0;
}
static const char *config_path(const LookupPaths *paths, PortableFlags flags) {
static const char *attached_path(const LookupPaths *paths, PortableFlags flags) {
const char *where;
assert(paths);
if (flags & PORTABLE_RUNTIME)
where = paths->runtime_config;
where = paths->runtime_attached;
else
where = paths->persistent_config;
where = paths->persistent_attached;
assert(where);
return where;
@@ -849,7 +849,7 @@ static int attach_unit_file(
assert(m);
assert(PORTABLE_METADATA_IS_UNIT(m));
where = config_path(paths, flags);
where = attached_path(paths, flags);
path = strjoina(where, "/", m->name);
dropin_dir = strjoin(path, ".d");
@@ -1147,7 +1147,7 @@ int portable_detach(
if (r < 0)
return r;
where = config_path(&paths, flags);
where = attached_path(&paths, flags);
d = opendir(where);
if (!d)
@@ -1314,7 +1314,7 @@ static int portable_get_state_internal(
if (r < 0)
return r;
where = config_path(&paths, flags);
where = attached_path(&paths, flags);
d = opendir(where);
if (!d)