From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 1 Apr 2014 08:33:43 +0000 (+0800)
Subject: discover/udev: duplicate devices aren't an error
X-Git-Tag: v1.0.0~209
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=70fb2ec0af31c1d78c8655ef13f682d597921390;hp=a574a72dcfea1bb61714754eca5612dde3632f0e

discover/udev: duplicate devices aren't an error

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>
---

diff --git a/discover/udev.c b/discover/udev.c
index 317b4bc..16e83d5 100644
--- a/discover/udev.c
+++ b/discover/udev.c
@@ -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);
-			return -1;
+			return 0;
 		}
 	}