From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 18 Nov 2025 21:33:06 +0000 (+0100)
Subject: dissect-image: make mountfsd_make_directory_fd() return param optional
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e742d749d3356192ac14e4d9710c6c19ca68cb78;p=thirdparty%2Fsystemd.git

dissect-image: make mountfsd_make_directory_fd() return param optional
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index bb83386c5a2..25041687f94 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -5291,7 +5291,6 @@ int mountfsd_make_directory_fd(
 
         assert(parent_fd >= 0);
         assert(name);
-        assert(ret_directory_fd);
 
         _cleanup_(sd_varlink_unrefp) sd_varlink *vl = NULL;
         r = sd_varlink_connect_address(&vl, "/run/systemd/io.systemd.MountFileSystem");
@@ -5337,7 +5336,8 @@ int mountfsd_make_directory_fd(
         if (directory_fd < 0)
                 return log_error_errno(directory_fd, "Failed to take directory fd from Varlink connection: %m");
 
-        *ret_directory_fd = TAKE_FD(directory_fd);
+        if (ret_directory_fd)
+                *ret_directory_fd = TAKE_FD(directory_fd);
         return 0;
 }