dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-07-22 07:20:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

portable: create/remove the 'attached' unit file directory when we can

Browse Source 
Let's not litter the system with this unit directory unnecessarily, and
let's try to create/remove it when necessary.
This commit is contained in:
Lennart Poettering
2018-10-08 17:44:52 +02:00
parent 2ace445da7
commit d09d85a2a0
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/portable/portable.c
View File

@@ -850,14 +850,24 @@ static int attach_unit_file(
assert(PORTABLE_METADATA_IS_UNIT(m));
where = attached_path(paths, flags);
path = strjoina(where, "/", m->name);
(void) mkdir_parents(where, 0755);
if (mkdir(where, 0755) < 0) {
if (errno != EEXIST)
return -errno;
} else
(void) portable_changes_add(changes, n_changes, PORTABLE_MKDIR, where, NULL);
path = strjoina(where, "/", m->name);
dropin_dir = strjoin(path, ".d");
if (!dropin_dir)
return -ENOMEM;
(void) mkdir_p(dropin_dir, 0755);
(void) portable_changes_add(changes, n_changes, PORTABLE_MKDIR, dropin_dir, NULL);
if (mkdir(dropin_dir, 0755) < 0) {
if (errno != EEXIST)
return -errno;
} else
(void) portable_changes_add(changes, n_changes, PORTABLE_MKDIR, dropin_dir, NULL);
/* We install the drop-ins first, and the actual unit file last to achieve somewhat atomic behaviour if PID 1
* is reloaded while we are creating things here: as long as only the drop-ins exist the unit doesn't exist at
@@ -1291,6 +1301,10 @@ int portable_detach(
portable_changes_add(changes, n_changes, PORTABLE_UNLINK, sl, NULL);
}
/* Try to remove the unit file directory, if we can */
if (rmdir(where) >= 0)
portable_changes_add(changes, n_changes, PORTABLE_UNLINK, where, NULL);
return ret;
not_found: