]> git.ozlabs.org Git - petitboot/commitdiff
discover/udev: duplicate devices aren't an error
authorJeremy Kerr <jk@ozlabs.org>
Tue, 1 Apr 2014 08:33:43 +0000 (16:33 +0800)
committerJeremy Kerr <jk@ozlabs.org>
Tue, 1 Apr 2014 08:41:08 +0000 (16:41 +0800)
We don't need to error out of udev_handle_block_add if this is a
duplicate UUID.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
discover/udev.c

index 317b4bc320d7e824cf15abb02e632c2bc33fb359..16e83d59312d700cbff05d5567d86ec47c548a39 100644 (file)
@@ -121,7 +121,7 @@ static int udev_handle_block_add(struct pb_udev *udev, struct udev_device *dev,
                if (ddev) {
                        pb_log("SKIP: %s UUID [%s] already present (as %s)\n",
                                        name, uuid, ddev->device->id);
                if (ddev) {
                        pb_log("SKIP: %s UUID [%s] already present (as %s)\n",
                                        name, uuid, ddev->device->id);
-                       return -1;
+                       return 0;
                }
        }
 
                }
        }