From b850a9b29f2bc14836415f0c85d42e7d4990285d Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Thu, 28 Jan 2021 13:25:41 +0000 Subject: [PATCH] MountImages: actually support optional paths ENOENT did not cause an image mount to be skipped, fix it --- src/core/namespace.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/core/namespace.c b/src/core/namespace.c index 4ed0991b56d..d98a53a39af 100644 --- a/src/core/namespace.c +++ b/src/core/namespace.c @@ -984,6 +984,8 @@ static int mount_images(const MountEntry *m) { assert(m); r = verity_dissect_and_mount(mount_entry_source(m), mount_entry_path(m), m->image_options); + if (r == -ENOENT && m->ignore) + return 0; if (r < 0) return log_debug_errno(r, "Failed to mount image %s on %s: %m", mount_entry_source(m), mount_entry_path(m)); -- 2.47.3