X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=80187ff49474a186cfb5b7e5bb7bceb0f4209404;hp=b083af4d0c6cdc0d406e9f609bcd7b387d4f6cbe;hb=90d16d056b4d7c6b8e2afb6b3406babd38f6c9e5;hpb=95a566908a5e02c51bd2af6b468df3fb9ad1bf75 diff --git a/discover/device-handler.c b/discover/device-handler.c index b083af4..80187ff 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -250,7 +250,7 @@ const char *discover_device_get_param(struct discover_device *device, list_for_each_entry(&device->params, param, list) { if (!strcmp(param->name, name)) - return param->name; + return param->value; } return NULL; } @@ -836,16 +836,8 @@ 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_log("couldn't mount device %s: mount failed with rc %d\n", + dev->device_path, rc); pb_rmdir_recursive(mount_base(), dev->mount_path); err_free: