From: Geoff Levand <geoff@infradead.org>
Date: Fri, 9 Mar 2012 01:41:15 +0000 (-0800)
Subject: Retry device mount without 'ro' option
X-Git-Tag: v1.0.0~787
X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=cff3fbc80d5b4dc473d724ac824376973c9ca1e7;ds=inline

Retry device mount without 'ro' option

Signed-off-by: Geoff Levand <geoff@infradead.org>
---

diff --git a/discover/device-handler.c b/discover/device-handler.c
index c72390b..6457dce 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -201,6 +201,9 @@ static int mount_device(struct discover_context *ctx)
 	argv[4] = "ro";
 	argv[5] = NULL;
 
+	if (pb_run_cmd(argv))
+		argv[3] = NULL; /* try without ro */
+
 	if (pb_run_cmd(argv))
 		goto out_rmdir;