From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 3 Sep 2020 14:56:07 +0000 (+0200)
Subject: udev-test: use mount_verbose() instead of mount(), to make debugging easier
X-Git-Tag: v247-rc1~303^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=91e0b0640ec394aa7501fb2437ef545648638f18;p=thirdparty%2Fsystemd.git

udev-test: use mount_verbose() instead of mount(), to make debugging easier
---

diff --git a/src/test/test-udev.c b/src/test/test-udev.c
index a9eda104376..968bfb32384 100644
--- a/src/test/test-udev.c
+++ b/src/test/test-udev.c
@@ -17,6 +17,7 @@
 #include "log.h"
 #include "main-func.h"
 #include "mkdir.h"
+#include "mount-util.h"
 #include "namespace-util.h"
 #include "selinux-util.h"
 #include "signal-util.h"
@@ -43,12 +44,12 @@ static int fake_filesystems(void) {
         if (r < 0)
                 return log_error_errno(r, "Failed to detach mount namespace: %m");
 
-        for (size_t i = 0; i < ELEMENTSOF(fakefss); i++)
-                if (mount(fakefss[i].src, fakefss[i].target, NULL, MS_BIND, NULL) < 0) {
-                        log_full_errno(fakefss[i].ignore_mount_error ? LOG_DEBUG : LOG_ERR, errno, "%s: %m", fakefss[i].error);
-                        if (!fakefss[i].ignore_mount_error)
-                                return -errno;
-                }
+        for (size_t i = 0; i < ELEMENTSOF(fakefss); i++) {
+                r = mount_verbose(fakefss[i].ignore_mount_error ? LOG_NOTICE : LOG_ERR,
+                                  fakefss[i].src, fakefss[i].target, NULL, MS_BIND, NULL);
+                if (r < 0 && !fakefss[i].ignore_mount_error)
+                        return r;
+        }
 
         return 0;
 }