pid1: pull in libmount unconditionally

diff --git a/src/core/main.c b/src/core/main.c
index d7651d0df988a6cdeaa68895a0aa4107877a26ca..f4acdb02c6c24f2f9d9b94e2c964835eecea6794 100644 (file)
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -59,6 +59,7 @@
 #include "killall.h"
 #include "kmod-setup.h"
 #include "label-util.h"
+#include "libmount-util.h"
 #include "limits-util.h"
 #include "load-fragment.h"
 #include "log.h"
@@ -3310,6 +3311,12 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
+        r = dlopen_libmount();
+        if (r < 0) {
+                error_message = "Failed to load libmount.so";
+                goto finish;
+        }
+
         r = initialize_runtime(skip_setup,
                                first_boot,
                                &saved_rlimit_nofile,

diff --git a/src/core/meson.build b/src/core/meson.build
index 10a7ae2f8cd68fe1d2b87cb10930bc9d72f82f2d..2aa47f548bc08f04abaccecc292f73c259f9046d 100644 (file)
--- a/src/core/meson.build
+++ b/src/core/meson.build
@@ -133,6 +133,7 @@ libcore_static = static_library(
         implicit_include_directories : false,
         c_args : ['-fvisibility=default'],
         dependencies : [libaudit_cflags,
+                        libbpf_cflags,
                         libdl,
                         libm,
                         libmount_cflags,
@@ -200,6 +201,7 @@ executables += [
                 'dependencies' : [
                         libapparmor_cflags,
                         libkmod_cflags,
+                        libmount_cflags,
                         libseccomp_cflags,
                         libselinux_cflags,
                 ],