commit 1b26f09eb0ab6925ca15835107e75c47931cdef2
author Lennart Poettering <lennart@poettering.net> Mon Jun 15 19:11:15 2015 +0200
committer Lennart Poettering <lennart@poettering.net> Mon Jun 15 19:28:55 2015 +0200
tree c5d7aa33e82f38ad196310bf1000ebc853e467cd
parent 14bcf25c8b94b5c3556ba3983028a2b35ed0572f

tmpfiles: make sure "R" lines also remove subvolumes

src/tmpfiles/tmpfiles.c

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index f7dad84..027a5c2 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -1465,7 +1465,7 @@
                 /* FIXME: we probably should use dir_cleanup() here
                  * instead of rm_rf() so that 'x' is honoured. */
                 log_debug("rm -rf \"%s\"", instance);
-                r = rm_rf(instance, (i->type == RECURSIVE_REMOVE_PATH ? REMOVE_ROOT : 0) | REMOVE_PHYSICAL);
+                r = rm_rf(instance, (i->type == RECURSIVE_REMOVE_PATH ? REMOVE_ROOT|REMOVE_SUBVOLUME : 0) | REMOVE_PHYSICAL);
                 if (r < 0 && r != -ENOENT)
                         return log_error_errno(r, "rm_rf(%s): %m", instance);