From: Jeremy Kerr <jk@ozlabs.org>
Date: Tue, 1 Oct 2013 03:03:48 +0000 (+0800)
Subject: discover: Don't continue discovery if mount fails
X-Git-Tag: v1.0.0~408
X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=bd6e384a0ba2c1464d9270baf829fea932b88224;ds=sidebyside

discover: Don't continue discovery if mount fails

Check the return value from mount_device and abort the discover on
failure.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
---

diff --git a/discover/device-handler.c b/discover/device-handler.c
index cd9c413..8b4046e 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -586,13 +586,16 @@ int device_handler_discover(struct device_handler *handler,
 		struct discover_device *dev, enum conf_method method)
 {
 	struct discover_context *ctx;
+	int rc;
 
 	process_boot_option_queue(handler);
 
 	/* create our context */
 	ctx = device_handler_discover_context_create(handler, dev);
 
-	mount_device(dev);
+	rc = mount_device(dev);
+	if (rc)
+		goto out;
 
 	/* run the parsers. This will populate the ctx's boot_option list. */
 	iterate_parsers(ctx, method);
@@ -600,6 +603,7 @@ int device_handler_discover(struct device_handler *handler,
 	/* add discovered stuff to the handler */
 	device_handler_discover_context_commit(handler, ctx);
 
+out:
 	talloc_free(ctx);
 
 	return 0;