growfs,repart: fix misuse of sd_device_get_devpath()

Follow-up for 0f79b3469f167583033d17f9a6fa0e4341a68003.

To obtain device node, sd_device_get_devname() must be used.

diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 88e503c86d0ee8def69688ffa87958fb63084e88..e5f570f0d34e15180f4e58b8b7d50de4c1367e94 100644 (file)
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -50,7 +50,7 @@ static int resize_crypt_luks_device(dev_t devno, const char *fstype, dev_t main_
                 return log_error_errno(r, "Failed to create main sd-device for block device " DEVNUM_FORMAT_STR ": %m",
                                        DEVNUM_FORMAT_VAL(main_devno));
 
-        r = sd_device_get_devpath(main_dev, &main_devpath);
+        r = sd_device_get_devname(main_dev, &main_devpath);
         if (r < 0)
                 return log_device_error_errno(main_dev, r, "Failed to get main devpath: %m");
 
@@ -69,7 +69,7 @@ static int resize_crypt_luks_device(dev_t devno, const char *fstype, dev_t main_
                 return log_error_errno(r, "Failed to create sd-device for block device " DEVNUM_FORMAT_STR ": %m",
                                        DEVNUM_FORMAT_VAL(devno));
 
-        r = sd_device_get_devpath(dev, &devpath);
+        r = sd_device_get_devname(dev, &devpath);
         if (r < 0)
                 return log_device_error_errno(dev, r, "Failed to get devpath: %m");
 
@@ -137,7 +137,7 @@ static int maybe_resize_underlying_device(
                 return log_error_errno(r, "Failed to create sd-device for block device " DEVNUM_FORMAT_STR ": %m",
                                        DEVNUM_FORMAT_VAL(devno));
 
-        r = sd_device_get_devpath(dev, &devpath);
+        r = sd_device_get_devname(dev, &devpath);
         if (r < 0)
                 return log_device_error_errno(dev, r, "Failed to get devpath: %m");
 
@@ -265,7 +265,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(r, "Failed to create sd-device for block device " DEVNUM_FORMAT_STR ": %m",
                                        DEVNUM_FORMAT_VAL(devno));
 
-        r = sd_device_get_devpath(dev, &devpath);
+        r = sd_device_get_devname(dev, &devpath);
         if (r < 0)
                 return log_device_error_errno(dev, r, "Failed to get devpath: %m");
 

diff --git a/src/partition/repart.c b/src/partition/repart.c
index 8824c105ffc8dcd0f7b84cc24de3aeed81e80af9..588aaa61324fd311cc6ee2ac9bcfbd5dc805e316 100644 (file)
--- a/src/partition/repart.c
+++ b/src/partition/repart.c
@@ -4049,7 +4049,7 @@ static int context_open_copy_block_paths(
                         if (r < 0)
                                 return log_error_errno(r, "Failed to create sd-device object for block device backing '%s': %m", opened);
 
-                        r = sd_device_get_devpath(dev, &bdev);
+                        r = sd_device_get_devname(dev, &bdev);
                         if (r < 0)
                                 return log_error_errno(r, "Failed to get device name for block device backing '%s': %m", opened);