From 636aabc272103aec02c09c3e12c997ce44b60949 Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Tue, 16 Jun 2015 16:22:16 +0200 Subject: 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 --- src/basic/rm-rf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/basic') 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 */ -- cgit v1.2.3-54-g00ecf