From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 6 Sep 2022 13:50:33 +0000 (+0900)
Subject: dissect-image: drop currently unused code
X-Git-Tag: v252-rc1~236^2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7726bd4b03b07f3aee4a4405ab1ffd8928567eda;p=thirdparty%2Fsystemd.git

dissect-image: drop currently unused code

Currently, dissect_image() is called only through dissect_loop_device(),
and image_path is always specified. Let's drop it.
---

diff --git a/src/shared/dissect-image.c b/src/shared/dissect-image.c
index b5c963656b8..d69a7bebc4c 100644
--- a/src/shared/dissect-image.c
+++ b/src/shared/dissect-image.c
@@ -305,24 +305,6 @@ int dissect_image(
                 .has_init_system = -1,
         };
 
-        if (!image_path) {
-                const char *sysname;
-
-                /* If image_path is not provided and the device is a loopback block device, then use the path
-                 * to the backing file. Note that the backing_file reference resolves symlinks, while for
-                 * sysext images we want the original path. */
-
-                r = sd_device_get_sysname(d, &sysname);
-                if (r < 0)
-                        return log_debug_errno(r, "Failed to get device sysname: %m");
-
-                if (startswith(sysname, "loop")) {
-                        r = sd_device_get_sysattr_value(d, "loop/backing_file", &image_path);
-                        if (r < 0)
-                                log_debug_errno(r, "Failed to lookup image name via loop device backing file sysattr, ignoring: %m");
-                }
-        }
-
         if (image_path) {
                 _cleanup_free_ char *extracted_filename = NULL, *name_stripped = NULL;