]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
shared: drop redundant cryptsetup_enable_logging(NULL) calls
authorDaan De Meyer <daan@amutable.com>
Thu, 23 Apr 2026 08:01:04 +0000 (08:01 +0000)
committerDaan De Meyer <daan@amutable.com>
Thu, 23 Apr 2026 08:01:04 +0000 (08:01 +0000)
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.

src/growfs/growfs.c
src/home/homework.c
src/repart/repart.c

index b544538d9d36b7df888740d00928fd69493ff35e..ff6a5909e795c1aa79d4ab36f6620257f346476d 100644 (file)
@@ -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",
index 578d5cce914f37821bacac1f69b577195ee99514..d63d48144738257e0847014377a3a09ddc13827c 100644 (file)
@@ -2005,8 +2005,6 @@ static int run(int argc, char *argv[]) {
 
         log_setup();
 
-        cryptsetup_enable_logging(NULL);
-
         umask(0022);
 
         if (argc < 2 || argc > 3)
index 91cd77b448f0b2fb7143228f544a1140e1eb5ce7..fac2bd817acee350daa731cc8ba6982eb8d1d51e 100644 (file)
@@ -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();