From f1dad9c1eb7cdc583a56734e9d46a1ce5bb755d5 Mon Sep 17 00:00:00 2001 From: Geoff Levand Date: Mon, 26 Mar 2012 20:16:37 -0700 Subject: [PATCH 1/1] Fix device mount retry Signed-off-by: Geoff Levand --- discover/device-handler.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/discover/device-handler.c b/discover/device-handler.c index 2888914..0783181 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -201,11 +201,18 @@ static int mount_device(struct discover_context *ctx) argv[4] = "ro"; argv[5] = NULL; - if (pb_run_cmd(argv, 1)) - argv[3] = NULL; /* try without ro */ + if (pb_run_cmd(argv, 1)) { - if (pb_run_cmd(argv, 1)) - goto out_rmdir; + /* Retry mount without ro option. */ + + argv[0] = MOUNT_BIN; + argv[1] = ctx->device_path; + argv[2] = ctx->mount_path; + argv[3] = NULL; + + if (pb_run_cmd(argv, 1)) + goto out_rmdir; + } setup_device_links(ctx); return 0; -- 2.39.2