From: Tom Gundersen <teg@jklm.no>
Date: Tue, 16 Jun 2015 14:22:16 +0000 (+0200)
Subject: tmpfiles: silently ignore failed removal of btrfs submount from non-dir
X-Git-Tag: v221~65^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=636aabc272103aec02c09c3e12c997ce44b60949;p=thirdparty%2Fsystemd.git

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 bafd483be2b..dbbe8176843 100644
--- 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 */