core: load libcryptsetup before forking off child that might need it

diff --git a/src/core/meson.build b/src/core/meson.build
index 2aa47f548bc08f04abaccecc292f73c259f9046d..c7beb8742ad8432aabd2a7013def15409ea2869e 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -134,6 +134,7 @@ libcore_static = static_library(
         c_args : ['-fvisibility=default'],
         dependencies : [libaudit_cflags,
                         libbpf_cflags,
+                        libcryptsetup_cflags,
                         libdl,
                         libm,
                         libmount_cflags,

diff --git a/src/core/service.c b/src/core/service.c
index a9d90354b695ef319013065c1c1176c5a72a31c6..12f4733274ca6a4773c3816c79b534e9f6150930 100644 (file)
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -14,6 +14,7 @@
 #include "bus-error.h"
 #include "bus-util.h"
 #include "chase.h"
+#include "cryptsetup-util.h"
 #include "dbus-service.h"
 #include "dbus-unit.h"
 #include "devnum-util.h"
@@ -5552,6 +5553,8 @@ static int service_live_mount(
                                 u->id);
         }
 
+        (void) dlopen_cryptsetup();
+
         service_unwatch_control_pid(s);
         s->live_mount_result = SERVICE_SUCCESS;
         s->control_command = NULL;