tmpfiles: silently ignore failed removal of btrfs submount from non-dir

This fixes:
Jun 16 16:00:20 tomegun-x2402 systemd-tmpfiles[233]: rm_rf(/var/lib/machines/.#fedora.lck): Not a directory
Jun 16 16:00:20 tomegun-x2402 systemd-tmpfiles[233]: rm_rf(/var/lib/machines/.#Fedora-Cloud-Base-20141203-21.x86_64.raw.lck): Not a directory

diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index bafd483be2bbf39f42d09257b03decbeb5bef9fc..dbbe8176843e01a7d74b963328fc4b39583fbfd8 100644 (file)
--- a/src/basic/rm-rf.c
+++ b/src/basic/rm-rf.c
@@ -182,7 +182,7 @@ int rm_rf(const char *path, RemoveFlags flags) {
                 if (r >= 0)
                         return r;
 
-                if (r != -ENOTTY && r != -EINVAL)
+                if (r != -ENOTTY && r != -EINVAL && r != -ENOTDIR)
                         return r;
 
                 /* Not btrfs or not a subvolume */