gpt-auto-generator: include device name in error reports

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index a26655f096fe6ddf4a62b1c8bec58b7d79a18330..60cbd7ee25ed0108295fa9f0d4671f7ab0250611 100644 (file)
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -299,7 +299,8 @@ static int enumerate_partitions(dev_t dev) {
 
         r = udev_enumerate_scan_devices(e);
         if (r < 0) {
 
         r = udev_enumerate_scan_devices(e);
         if (r < 0) {

-                log_error("Failed to enumerate partitions: %s", strerror(-r));
+                log_error("Failed to enumerate partitions on /dev/block/%u:%u: %s",
+                          major(dev), minor(dev), strerror(-r));

                 goto finish;
         }
 
                 goto finish;
         }
 


@@ -310,6 +311,7 @@ static int enumerate_partitions(dev_t dev) {
                 struct udev_device *q;
                 sd_id128_t type_id;
                 unsigned nr;
                 struct udev_device *q;
                 sd_id128_t type_id;
                 unsigned nr;

+                dev_t sub;

 
                 q = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
                 if (!q) {
 
                 q = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
                 if (!q) {


@@ -329,9 +331,12 @@ static int enumerate_partitions(dev_t dev) {
                         goto finish;
                 }
 
                         goto finish;
                 }
 

-                r = verify_gpt_partition(udev_device_get_devnum(q), &type_id, &nr, &fstype);
+                sub = udev_device_get_devnum(q);
+
+                r = verify_gpt_partition(sub, &type_id, &nr, &fstype);

                 if (r < 0) {
                 if (r < 0) {

-                        log_error("Failed to verify GPT partition: %s", strerror(-r));
+                        log_error("Failed to verify GPT partition /dev/block/%u:%u: %s",
+                                  major(sub), minor(sub), strerror(-r));

                         udev_device_unref(q);
                         goto finish;
                 }
                         udev_device_unref(q);
                         goto finish;
                 }


@@ -483,11 +488,12 @@ int main(int argc, char *argv[]) {
                 return EXIT_SUCCESS;
         }
 
                 return EXIT_SUCCESS;
         }
 

-        log_debug("Root device %u:%u.", major(dev), minor(dev));
+        log_debug("Root device /dev/block/%u:%u.", major(dev), minor(dev));

 
         r = verify_gpt_partition(dev, NULL, NULL, NULL);
         if (r < 0) {
 
         r = verify_gpt_partition(dev, NULL, NULL, NULL);
         if (r < 0) {

-                log_error("Failed to verify GPT partition: %s", strerror(-r));
+                log_error("Failed to verify GPT partition /dev/block/%u:%u: %s",
+                          major(dev), minor(dev), strerror(-r));

                 return EXIT_FAILURE;
         }
         if (r == 0)
                 return EXIT_FAILURE;
         }
         if (r == 0)