discover: Allow devices with no device_path

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 43171eb7e1d7f0e2f6ec95392d364597dfa8c1cf..23961249ff595b857b327a34f025e31c64a97d1d 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -235,6 +235,9 @@ static int mount_device(struct discover_device *dev)
 {
        const char *argv[6];
 
 {
        const char *argv[6];
 

+       if (!dev->device_path)
+               return -1;
+

        if (!dev->mount_path)
                dev->mount_path = join_paths(dev, mount_base(),
                                                dev->device_path);
        if (!dev->mount_path)
                dev->mount_path = join_paths(dev, mount_base(),
                                                dev->device_path);


@@ -576,7 +579,7 @@ void device_handler_destroy(struct device_handler *handler)
 
 static int device_match_path(struct discover_device *dev, const char *path)
 {
 
 static int device_match_path(struct discover_device *dev, const char *path)
 {

-       return !strcmp(dev->device_path, path);
+       return dev->device_path && !strcmp(dev->device_path, path);

 }
 
 static int device_match_uuid(struct discover_device *dev, const char *uuid)
 }
 
 static int device_match_uuid(struct discover_device *dev, const char *uuid)