From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 19 May 2020 10:10:11 +0000 (+0200)
Subject: test-fs-util: don't fail on btrfs file systems in containers
X-Git-Tag: v246-rc1~332^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f8838c6c2f841701ab41c85b346958445bb0825d;p=thirdparty%2Fsystemd.git

test-fs-util: don't fail on btrfs file systems in containers

Fixes: #15821
---

diff --git a/src/test/test-fs-util.c b/src/test/test-fs-util.c
index d005b3e8e5f..e144551eb75 100644
--- a/src/test/test-fs-util.c
+++ b/src/test/test-fs-util.c
@@ -850,6 +850,12 @@ static void test_path_is_encrypted_one(const char *p, int expect) {
         int r;
 
         r = path_is_encrypted(p);
+        if (r == -ENOENT) /* This might fail, if btrfs is used and we run in a container. In that case we
+                           * cannot resolve the device node paths that BTRFS_IOC_DEV_INFO returns, because
+                           * the device nodes are unlikely to exist in the container. But if we can't stat()
+                           * them we cannot determine the dev_t of them, and thus cannot figure out if they
+                           * are enrypted. Hence let's just ignore ENOENT here. */
+                return;
         assert_se(r >= 0);
 
         printf("%s encrypted: %s\n", p, yes_no(r));