summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-06-16 18:00:28 +0200
committerLennart Poettering <lennart@poettering.net>2015-06-16 18:00:28 +0200
commitc986cc70002cf8f28e6ea1e63da46a8124a0882c (patch)
treeab47cc0c2adba892404ce4034a48839317363ea2 /src/basic
parent9ef41ffeec0a677f0c8006b17e5ff1c8434418a3 (diff)
parent636aabc272103aec02c09c3e12c997ce44b60949 (diff)
Merge pull request #228 from teg/tmpfiles-btrfs-notdir
tmpfiles: silently ignore failed removal of btrfs submount from non-dir
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/rm-rf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/basic/rm-rf.c b/src/basic/rm-rf.c
index bafd483be2..dbbe817684 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 */