systemctl: rm empty dropin dirs after cancelled edit

Fixes #2734
This commit is contained in:
Ronny Chevalier
2016-03-02 22:06:47 +01:00
parent 77f911c56b
commit 5f18271ec1
+11 -1
View File
@@ -6162,9 +6162,19 @@ static int edit(int argc, char *argv[], void *userdata) {
r = daemon_reload(argc, argv, userdata);
end:
STRV_FOREACH_PAIR(original, tmp, paths)
STRV_FOREACH_PAIR(original, tmp, paths) {
(void) unlink(*tmp);
/* Removing empty dropin dirs */
if (!arg_full) {
_cleanup_free_ char *dir = dirname_malloc(*original);
/* no need to check if the dir is empty, rmdir
* does nothing if it is not the case.
*/
(void) rmdir(dir);
}
}
return r;
}