diff options
author | Jeremy Kerr <jk@ozlabs.org> | 2014-03-07 09:05:00 +0800 |
---|---|---|
committer | Jeremy Kerr <jk@ozlabs.org> | 2014-03-07 09:05:00 +0800 |
commit | d8d61e648ebf6a3336820db94244c4251361cf2f (patch) | |
tree | 2af6489f3c9faff05d59070e625cbd325580d20e /discover | |
parent | f7ace4cc96390a26b0f6c5ee4ff8fe6d7d62ecd0 (diff) | |
download | talos-petitboot-d8d61e648ebf6a3336820db94244c4251361cf2f.tar.gz talos-petitboot-d8d61e648ebf6a3336820db94244c4251361cf2f.zip |
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 <jk@ozlabs.org>
Diffstat (limited to 'discover')
-rw-r--r-- | discover/device-handler.c | 11 |
1 files changed, 0 insertions, 11 deletions
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); |