From: Daan De Meyer <daan@amutable.com>
Date: Thu, 23 Apr 2026 08:01:04 +0000 (+0000)
Subject: shared: drop redundant cryptsetup_enable_logging(NULL) calls
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=724e5b51e7c837210fddfac42ccd8ccee7d385a1;p=thirdparty%2Fsystemd.git

shared: drop redundant cryptsetup_enable_logging(NULL) calls

These were only used to implicitly load libcryptsetup at startup.
dlopen_cryptsetup() now calls cryptsetup_enable_logging(NULL) itself,
and every code path that uses libcryptsetup calls dlopen_cryptsetup()
before doing so, so the upfront calls are no longer needed.
---

diff --git a/src/growfs/growfs.c b/src/growfs/growfs.c
index b544538d9d3..ff6a5909e79 100644
--- a/src/growfs/growfs.c
+++ b/src/growfs/growfs.c
@@ -93,10 +93,6 @@ static int maybe_resize_underlying_device(
         assert(mountfd >= 0);
         assert(mountpath);
 
-#if HAVE_LIBCRYPTSETUP
-        cryptsetup_enable_logging(NULL);
-#endif
-
         r = get_block_device_harder_fd(mountfd, &devno);
         if (r < 0)
                 return log_error_errno(r, "Failed to determine underlying block device of \"%s\": %m",
diff --git a/src/home/homework.c b/src/home/homework.c
index 578d5cce914..d63d4814473 100644
--- a/src/home/homework.c
+++ b/src/home/homework.c
@@ -2005,8 +2005,6 @@ static int run(int argc, char *argv[]) {
 
         log_setup();
 
-        cryptsetup_enable_logging(NULL);
-
         umask(0022);
 
         if (argc < 2 || argc > 3)
diff --git a/src/repart/repart.c b/src/repart/repart.c
index 91cd77b448f..fac2bd817ac 100644
--- a/src/repart/repart.c
+++ b/src/repart/repart.c
@@ -11222,10 +11222,6 @@ static int run(int argc, char *argv[]) {
         if (r < 0)
                 return r;
 
-#if HAVE_LIBCRYPTSETUP
-        cryptsetup_enable_logging(NULL);
-#endif
-
         if (arg_varlink)
                 return vl_server();