summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO3
-rw-r--r--src/tmpfiles/tmpfiles.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/TODO b/TODO
index 13174e4306..f53328623c 100644
--- a/TODO
+++ b/TODO
@@ -27,6 +27,9 @@ Bugfixes:
Features:
+* change $NOTIFY_SOCKET to use an abstract namespace socket, so that chroot() is compatible with this
+ https://bugzilla.redhat.com/show_bug.cgi?id=833105
+
* readahead: merge the three tools into one binary
* systemctl: when stopping a service which has triggres and warning about it actually check the TriggeredBy= deps fields
diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index 841d163523..dfe3daa7f7 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -843,6 +843,8 @@ static int remove_item_instance(Item *i, const char *instance) {
case TRUNCATE_DIRECTORY:
case RECURSIVE_REMOVE_PATH:
+ /* FIXME: we probably should use dir_cleanup() here
+ * instead of rm_rf() so that 'x' is honoured. */
r = rm_rf(instance, false, i->type == RECURSIVE_REMOVE_PATH, false);
if (r < 0 && r != -ENOENT) {
log_error("rm_rf(%s): %s", instance, strerror(-r));