From d8d61e648ebf6a3336820db94244c4251361cf2f Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Fri, 7 Mar 2014 09:05:00 +0800 Subject: discover: don't retry mount without ro option Currently, if the read-only mount fails during device discovery, we retry without the '-o ro' option. This was originally due to the read-only mount failing when a device was already mounted elsewhere. Since we check for exsiting mounts now, we can drop this retry. Signed-off-by: Jeremy Kerr --- discover/device-handler.c | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'discover/device-handler.c') diff --git a/discover/device-handler.c b/discover/device-handler.c index f1845a9..eaa85de 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -836,17 +836,6 @@ static int mount_device(struct discover_device *dev) return 0; } - /* Retry mount without ro option. */ - rc = process_run_simple(dev, pb_system_apps.mount, - dev->device_path, dev->mount_path, NULL); - - if (!rc) { - dev->mounted = true; - dev->mounted_rw = true; - dev->unmount = true; - return 0; - } - pb_rmdir_recursive(mount_base(), dev->mount_path); err_free: talloc_free(dev->mount_path); -- cgit v1.2.1