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 c72390b438d7222540b467619d6f2865117eb503..6457dce6b68c5acf39ff8b8e5525a25b7caf9612 100644 (file)
--- 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;
 
        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;
 
        if (pb_run_cmd(argv))
                goto out_rmdir;