#include <process/process.h>
#include <url/url.h>
#include <i18n/i18n.h>
+#include <pb-config/pb-config.h>
+#include <sys/sysmacros.h>
#include <sys/types.h>
#include <sys/socket.h>
#include <netdb.h>
DEFAULT_PRIORITY_DISABLED = 0xff,
};
+struct progress_info {
+ unsigned int percentage;
+ unsigned long size; /* size in bytes */
+
+ const struct process_info *procinfo;
+ struct list_item list;
+};
+
struct device_handler {
struct discover_server *server;
int dry_run;
struct boot_task *pending_boot;
bool pending_boot_is_default;
+
+ struct list progress;
+ unsigned int n_progress;
+
+ struct plugin_option **plugins;
+ unsigned int n_plugins;
+ bool plugin_installing;
};
static int mount_device(struct discover_device *dev);
return handler->devices[index];
}
+/**
+ * device_handler_get_plugin_count - Get the count of current handler plugins.
+ */
+int device_handler_get_plugin_count(const struct device_handler *handler)
+{
+ return handler->n_plugins;
+}
+
+/**
+ * discover_handler_get_plugin - Get a handler plugin by index.
+ */
+const struct plugin_option *device_handler_get_plugin(
+ const struct device_handler *handler, unsigned int index)
+{
+ if (index >= handler->n_plugins) {
+ assert(0 && "bad index");
+ return NULL;
+ }
+
+ return handler->plugins[index];
+}
+
+struct network *device_handler_get_network(
+ const struct device_handler *handler)
+{
+ return handler->network;
+}
+
struct discover_boot_option *discover_boot_option_create(
struct discover_context *ctx,
struct discover_device *device)
}
struct discover_device *discover_device_create(struct device_handler *handler,
- const char *id)
+ const char *uuid, const char *id)
{
struct discover_device *dev;
- dev = device_lookup_by_id(handler, id);
+ if (uuid)
+ dev = device_lookup_by_uuid(handler, uuid);
+ else
+ dev = device_lookup_by_id(handler, id);
+
if (dev)
return dev;
dev = talloc_zero(handler, struct discover_device);
dev->device = talloc_zero(dev, struct device);
dev->device->id = talloc_strdup(dev->device, id);
+ dev->uuid = talloc_strdup(dev, uuid);
list_init(&dev->params);
list_init(&dev->boot_options);
return NULL;
}
+static void set_env_variables(const struct config *config)
+{
+ if (config->http_proxy)
+ setenv("http_proxy", config->http_proxy, 1);
+ else
+ unsetenv("http_proxy");
+
+ if (config->https_proxy)
+ setenv("https_proxy", config->https_proxy, 1);
+ else
+ unsetenv("https_proxy");
+
+ /* Reduce noise in the log from LVM listing open file descriptors */
+ setenv("LVM_SUPPRESS_FD_WARNINGS", "1", 1);
+}
+
struct device_handler *device_handler_init(struct discover_server *server,
struct waitset *waitset, int dry_run)
{
handler->server = server;
handler->waitset = waitset;
handler->dry_run = dry_run;
- handler->autoboot_enabled = config_get()->autoboot_enabled;
+ handler->autoboot_enabled = config_autoboot_active(config_get());
list_init(&handler->unresolved_boot_options);
+ list_init(&handler->progress);
+
/* set up our mount point base */
pb_mkdir_recursive(mount_base());
if (config_get()->safe_mode)
return handler;
+ set_env_variables(config_get());
+
rc = device_handler_init_sources(handler);
if (rc) {
talloc_free(handler);
{
struct discover_boot_option *opt, *tmp;
struct ramdisk_device *ramdisk;
+ struct config *config;
unsigned int i;
device_handler_cancel_default(handler);
+ /* Cancel any pending non-default boot */
+ if (handler->pending_boot) {
+ boot_cancel(handler->pending_boot);
+ handler->pending_boot = NULL;
+ handler->pending_boot_is_default = false;
+ }
+
+ /* Cancel any remaining async jobs */
+ process_stop_async_all();
+ pending_network_jobs_cancel();
/* free unresolved boot options */
list_for_each_entry_safe(&handler->unresolved_boot_options,
handler->ramdisks = NULL;
handler->n_ramdisks = 0;
+ /* drop any known plugins */
+ for (i = 0; i < handler->n_plugins; i++)
+ talloc_free(handler->plugins[i]);
+ talloc_free(handler->plugins);
+ handler->plugins = NULL;
+ handler->n_plugins = 0;
+
+ discover_server_notify_plugins_remove(handler->server);
+
+ set_env_variables(config_get());
+
+ /* If the safe mode warning was active disable it now */
+ if (config_get()->safe_mode) {
+ config = config_copy(handler, config_get());
+ config->safe_mode = false;
+ config_set(config);
+ discover_server_notify_config(handler->server, config);
+ }
+
device_handler_reinit_sources(handler);
}
talloc_free(device);
}
-void device_handler_boot_status(void *arg, struct boot_status *status)
+void device_handler_status(struct device_handler *handler,
+ struct status *status)
{
- struct device_handler *handler = arg;
-
discover_server_notify_boot_status(handler->server, status);
}
+static void _device_handler_vstatus(struct device_handler *handler,
+ enum status_type type, const char *fmt, va_list ap)
+{
+ struct status status;
+
+ status.type = type;
+ status.message = talloc_vasprintf(handler, fmt, ap);
+ status.backlog = false;
+
+ device_handler_status(handler, &status);
+
+ talloc_free(status.message);
+}
+
+static void _device_handler_vdevstatus(struct device_handler *handler,
+ struct discover_device *device, enum status_type type,
+ const char *fmt, va_list ap)
+{
+ char *msg;
+
+ msg = talloc_asprintf(handler, "[%s] %s",
+ device ? device->device->id : "unknown", fmt);
+ _device_handler_vstatus(handler, type, msg, ap);
+ talloc_free(msg);
+}
+
+void device_handler_status_dev_info(struct device_handler *handler,
+ struct discover_device *dev, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vdevstatus(handler, dev, STATUS_INFO, fmt, ap);
+ va_end(ap);
+}
+
+void device_handler_status_dev_err(struct device_handler *handler,
+ struct discover_device *dev, const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vdevstatus(handler, dev, STATUS_ERROR, fmt, ap);
+ va_end(ap);
+}
+
+void device_handler_status_info(struct device_handler *handler,
+ const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vstatus(handler, STATUS_INFO, fmt, ap);
+ va_end(ap);
+}
+
+void device_handler_status_err(struct device_handler *handler,
+ const char *fmt, ...)
+{
+ va_list ap;
+
+ va_start(ap, fmt);
+ _device_handler_vstatus(handler, STATUS_ERROR, fmt, ap);
+ va_end(ap);
+}
+
+void device_handler_status_download(struct device_handler *handler,
+ const struct process_info *procinfo,
+ unsigned int percentage, unsigned int size, char suffix)
+{
+ struct progress_info *p, *progress = NULL;
+ uint64_t current_converted, current = 0;
+ const char *units = " kMGTP";
+ unsigned long size_bytes;
+ char *update = NULL;
+ double total = 0;
+ unsigned int i;
+ int unit = 0;
+
+ list_for_each_entry(&handler->progress, p, list)
+ if (p->procinfo == procinfo)
+ progress = p;
+
+ if (!progress) {
+ pb_log("Registering new progress struct\n");
+ progress = talloc_zero(handler, struct progress_info);
+ if (!progress) {
+ pb_log("Failed to allocate room for progress struct\n");
+ return;
+ }
+ progress->procinfo = procinfo;
+ list_add(&handler->progress, &progress->list);
+ handler->n_progress++;
+ }
+
+ size_bytes = size;
+ for (i = 0; i < strlen(units); i++) {
+ if (units[i] == suffix)
+ break;
+ }
+
+ if (i >= strlen(units)) {
+ pb_log("Couldn't recognise suffix '%c'\n", suffix);
+ size_bytes = 0;
+ } else {
+ while (i--)
+ size_bytes <<= 10;
+ }
+
+ progress->percentage = percentage;
+ progress->size = size_bytes;
+
+ /*
+ * Aggregate the info we have and update status. If a progress struct
+ * has zero for both percentage and size we assume progress information
+ * is unavailable and fall back to a generic progress message.
+ */
+ list_for_each_entry(&handler->progress, p, list) {
+ uint64_t c;
+ double t;
+ if (!p->percentage || !p->size) {
+ update = talloc_asprintf(handler,
+ _("%u downloads in progress..."),
+ handler->n_progress);
+ current = total = 0;
+ break;
+ }
+
+ c = p->size;
+ t = (100 * c) / p->percentage;
+
+ current += c;
+ total += t;
+ }
+
+ if (total) {
+ current_converted = current;
+ while (current_converted >= 1000) {
+ current_converted >>= 10;
+ unit++;
+ }
+ update = talloc_asprintf(handler,
+ _("%u %s downloading: %.0f%% - %lu%cB"),
+ handler->n_progress,
+ ngettext("item", "items", handler->n_progress),
+ (current / total) * 100, current_converted,
+ units[unit]);
+ }
+
+ if (!update) {
+ pb_log("%s: failed to allocate new status\n", __func__);
+ } else {
+ device_handler_status_info(handler, "%s\n", update);
+ talloc_free(update);
+ }
+}
+
+static void device_handler_plugin_scan_device(struct device_handler *handler,
+ struct discover_device *dev)
+{
+ int rc;
+
+ pb_debug("Scanning %s for plugin files\n", dev->device->id);
+
+ rc = process_run_simple(handler, pb_system_apps.pb_plugin,
+ "scan", dev->mount_path,
+ NULL);
+ if (rc)
+ pb_log("Error from pb-plugin scan %s\n",
+ dev->mount_path);
+}
+
+void device_handler_status_download_remove(struct device_handler *handler,
+ struct process_info *procinfo)
+{
+ struct progress_info *p, *tmp;
+
+ list_for_each_entry_safe(&handler->progress, p, tmp, list)
+ if (p->procinfo == procinfo) {
+ list_remove(&p->list);
+ talloc_free(p);
+ handler->n_progress--;
+ }
+}
+
+static void device_handler_boot_status_cb(void *arg, struct status *status)
+{
+ device_handler_status(arg, status);
+}
+
static void countdown_status(struct device_handler *handler,
struct discover_boot_option *opt, unsigned int sec)
{
- struct boot_status status;
+ struct status status;
- status.type = BOOT_STATUS_INFO;
- status.progress = -1;
- status.detail = NULL;
+ status.type = STATUS_INFO;
status.message = talloc_asprintf(handler,
- _("Booting in %d sec: %s"), sec, opt->option->name);
+ _("Booting in %d sec: [%s] %s"), sec,
+ opt->device->device->id, opt->option->name);
+ status.backlog = false;
- discover_server_notify_boot_status(handler->server, &status);
+ device_handler_status(handler, &status);
talloc_free(status.message);
}
platform_pre_boot();
handler->pending_boot = boot(handler, handler->default_boot_option,
- NULL, handler->dry_run, device_handler_boot_status,
+ NULL, handler->dry_run, device_handler_boot_status_cb,
handler);
handler->pending_boot_is_default = true;
return 0;
struct discover_context *ctx;
ctx = talloc_zero(handler, struct discover_context);
+ ctx->handler = handler;
ctx->device = device;
- ctx->network = handler->network;
list_init(&ctx->boot_options);
return ctx;
struct discover_device *dev)
{
struct discover_context *ctx;
- struct boot_status *status;
int rc;
- status = talloc_zero(handler, struct boot_status);
- status->type = BOOT_STATUS_INFO;
- /*
- * TRANSLATORS: this string will be passed the type and identifier
- * of the device. For example, the first parameter could be "Disk",
- * (which will be translated accordingly) and the second a Linux device
- * identifier like 'sda1' (which will not be translated)
- */
- status->message = talloc_asprintf(status, _("Processing %s device %s"),
- device_type_display_name(dev->device->type),
- dev->device->id);
- device_handler_boot_status(handler, status);
-
- process_boot_option_queue(handler);
+ device_handler_status_dev_info(handler, dev,
+ /*
+ * TRANSLATORS: this string will be passed the type of the
+ * device (eg "disk" or "network"), which will be translated
+ * accordingly.
+ */
+ _("Processing new %s device"),
+ device_type_display_name(dev->device->type));
/* create our context */
ctx = device_handler_discover_context_create(handler, dev);
/* add discovered stuff to the handler */
device_handler_discover_context_commit(handler, ctx);
-out:
- /*
- * TRANSLATORS: the format specifier in this string is a Linux
- * device identifier, like 'sda1'
- */
- status->message = talloc_asprintf(status,_("Processing %s complete"),
- dev->device->id);
- device_handler_boot_status(handler, status);
+ process_boot_option_queue(handler);
- talloc_free(status);
+ /* Check this device for pb-plugins */
+ device_handler_plugin_scan_device(handler, dev);
+out:
talloc_unlink(handler, ctx);
return 0;
struct discover_device *dev, struct event *event)
{
struct discover_context *ctx;
- struct boot_status *status;
- status = talloc_zero(handler, struct boot_status);
- status->type = BOOT_STATUS_INFO;
- /*
- * TRANSLATORS: this format specifier will be the name of a network
- * device, like 'eth0'.
- */
- status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
- dev->device->id);
- device_handler_boot_status(handler, status);
+ device_handler_status_dev_info(handler, dev,
+ _("Processing DHCP lease response (ip: %s)"),
+ event_get_param(event, "ip"));
+
+ pending_network_jobs_start();
/* create our context */
ctx = device_handler_discover_context_create(handler, dev);
device_handler_discover_context_commit(handler, ctx);
- /*
- * TRANSLATORS: this format specifier will be the name of a network
- * device, like 'eth0'.
- */
- status->message = talloc_asprintf(status,_("Processing %s complete"),
- dev->device->id);
- device_handler_boot_status(handler, status);
-
- talloc_free(status);
- talloc_unlink(handler, ctx);
-
- return 0;
-}
-
-/* incoming conf event */
-int device_handler_conf(struct device_handler *handler,
- struct discover_device *dev, struct pb_url *url)
-{
- struct discover_context *ctx;
- struct boot_status *status;
-
- status = talloc_zero(handler, struct boot_status);
- status->type = BOOT_STATUS_INFO;
- status->message = talloc_asprintf(status, _("Processing user config"));
- device_handler_boot_status(handler, status);
-
- /* create our context */
- ctx = device_handler_discover_context_create(handler, dev);
- ctx->conf_url = url;
-
- iterate_parsers(ctx);
-
- device_handler_discover_context_commit(handler, ctx);
-
- status->message = talloc_asprintf(status,
- _("Processing user config complete"));
- device_handler_boot_status(handler, status);
-
- talloc_free(status);
talloc_unlink(handler, ctx);
return 0;
platform_pre_boot();
handler->pending_boot = boot(handler, opt, cmd, handler->dry_run,
- device_handler_boot_status, handler);
+ device_handler_boot_status_cb, handler);
handler->pending_boot_is_default = false;
}
void device_handler_cancel_default(struct device_handler *handler)
{
- struct boot_status status;
-
if (handler->timeout_waiter)
waiter_remove(handler->timeout_waiter);
handler->default_boot_option = NULL;
- status.type = BOOT_STATUS_INFO;
- status.progress = -1;
- status.detail = NULL;
- status.message = _("Default boot cancelled");
-
- discover_server_notify_boot_status(handler->server, &status);
+ device_handler_status_info(handler, _("Default boot cancelled"));
}
void device_handler_update_config(struct device_handler *handler,
return dev;
}
+static void process_url_cb(struct load_url_result *result, void *data)
+{
+ struct device_handler *handler;
+ struct discover_context *ctx;
+ struct discover_device *dev;
+ struct event *event = data;
+ const char *mac;
+
+ if (result->status != LOAD_OK) {
+ pb_log("%s: Load failed for %s\n", __func__, result->url->full);
+ return;
+ }
+
+ if (!event)
+ return;
+
+ handler = talloc_parent(event);
+ if (!handler)
+ return;
+
+ event->device = device_from_addr(event, result->url);
+ if (!event->device) {
+ pb_log("Downloaded a file but can't find its interface - pretending it was local\n");
+ event->device = talloc_asprintf(event, "local");
+ }
+
+ mac = event_get_param(event, "mac");
+ char *url = talloc_asprintf(event, "file://%s", result->local);
+ event_set_param(event, "pxeconffile", url);
+
+ dev = discover_device_create(handler, mac, event->device);
+ ctx = device_handler_discover_context_create(handler, dev);
+ talloc_steal(ctx, event);
+ ctx->event = event;
+
+ iterate_parsers(ctx);
+
+ device_handler_discover_context_commit(handler, ctx);
+
+ talloc_unlink(handler, ctx);
+}
+
void device_handler_process_url(struct device_handler *handler,
const char *url, const char *mac, const char *ip)
{
struct discover_context *ctx;
struct discover_device *dev;
- struct boot_status *status;
+ bool allow_async = false;
struct pb_url *pb_url;
struct event *event;
- struct param *param;
- status = talloc(handler, struct boot_status);
-
- status->type = BOOT_STATUS_ERROR;
- status->progress = 0;
- status->detail = talloc_asprintf(status,
- _("Received config URL %s"), url);
+ event = talloc_zero(handler, struct event);
+ event->type = EVENT_TYPE_USER;
+ event->action = EVENT_ACTION_URL;
- if (!handler->network) {
- status->message = talloc_asprintf(handler,
- _("No network configured"));
- goto msg;
+ pb_url = pb_url_parse(event, url);
+ if (!pb_url || (pb_url->scheme != pb_url_file && !pb_url->host)) {
+ device_handler_status_err(handler, _("Invalid config URL!"));
+ talloc_free(event);
+ return;
}
- event = talloc(handler, struct event);
- event->type = EVENT_TYPE_USER;
- event->action = EVENT_ACTION_CONF;
-
if (url[strlen(url) - 1] == '/') {
- event->params = talloc_array(event, struct param, 3);
- param = &event->params[0];
- param->name = talloc_strdup(event, "pxepathprefix");
- param->value = talloc_strdup(event, url);
- param = &event->params[1];
- param->name = talloc_strdup(event, "mac");
- param->value = talloc_strdup(event, mac);
- param = &event->params[2];
- param->name = talloc_strdup(event, "ip");
- param->value = talloc_strdup(event, ip);
- event->n_params = 3;
+ event_set_param(event, "pxepathprefix", url);
+ event_set_param(event, "mac", mac);
+ event_set_param(event, "ip", ip);
+ event->device = device_from_addr(event, pb_url);
+ if (!event->device) {
+ device_handler_status_err(handler,
+ _("Unable to route to host %s"),
+ pb_url->host);
+ talloc_free(event);
+ return;
+ }
} else {
- event->params = talloc_array(event, struct param, 1);
- param = &event->params[0];
- param->name = talloc_strdup(event, "pxeconffile");
- param->value = talloc_strdup(event, url);
- event->n_params = 1;
- }
-
- pb_url = pb_url_parse(event, event->params->value);
- if (!pb_url || (pb_url->scheme != pb_url_file && !pb_url->host)) {
- status->message = talloc_asprintf(handler,
- _("Invalid config URL!"));
- goto msg;
+ event_set_param(event, "pxeconffile", url);
+ allow_async = true;
}
if (pb_url->scheme == pb_url_file)
event->device = talloc_asprintf(event, "local");
- else
- event->device = device_from_addr(event, pb_url);
-
- if (!event->device) {
- status->message = talloc_asprintf(status,
- _("Unable to route to host %s"),
- pb_url->host);
- goto msg;
+ else if (allow_async) {
+ /* If file is remote load asynchronously before passing to
+ * parser. This allows us to wait for network to be available */
+ if (!load_url_async(handler, pb_url, process_url_cb, event,
+ NULL, handler)) {
+ pb_log("Failed to load url %s\n", pb_url->full);
+ device_handler_status_err(handler, _("Failed to load URL!"));
+ talloc_free(event);
+ }
+ return;
}
- dev = discover_device_create(handler, event->device);
+ /* If path is local we can parse straight away */
+
+ dev = discover_device_create(handler, mac, event->device);
if (pb_url->scheme == pb_url_file)
dev->device->type = DEVICE_TYPE_ANY;
ctx = device_handler_discover_context_create(handler, dev);
device_handler_discover_context_commit(handler, ctx);
talloc_unlink(handler, ctx);
+}
+
+static void plugin_install_cb(struct process *process)
+{
+ struct device_handler *handler = process->data;
+
+ if (!handler) {
+ pb_log("%s: Missing data!\n", __func__);
+ return;
+ }
+
+ handler->plugin_installing = false;
+ if (process->exit_status) {
+ device_handler_status_err(handler, "Plugin failed to install!");
+ pb_log("Failed to install plugin:\n%s\n", process->stdout_buf);
+ }
+}
+
+void device_handler_install_plugin(struct device_handler *handler,
+ const char *plugin_file)
+{
+ struct process *p;
+ int result;
+
+ if (handler->plugin_installing) {
+ pb_log("Plugin install cancelled - install already running");
+ return;
+ }
+
+ p = process_create(handler);
+ if (!p) {
+ pb_log("install_plugin: Failed to create process\n");
+ return;
+ }
+
+ const char *argv[] = {
+ pb_system_apps.pb_plugin,
+ "install",
+ "auto",
+ plugin_file,
+ NULL
+ };
+
+ p->path = pb_system_apps.pb_plugin;
+ p->argv = argv;
+ p->exit_cb = plugin_install_cb;
+ p->data = handler;
+ p->keep_stdout = true;
+
+ result = process_run_async(p);
- status->type = BOOT_STATUS_INFO;
- status->message = talloc_asprintf(status, _("Config file %s parsed"),
- pb_url->file);
-msg:
- device_handler_boot_status(handler, status);
- talloc_free(status);
+ if (result)
+ device_handler_status_err(handler, "Could not install plugin");
+ else
+ handler->plugin_installing = true;
}
#ifndef PETITBOOT_TEST
struct discover_device *dev = ctx->device;
struct discover_boot_option *opt, *tmp;
- if (!device_lookup_by_id(handler, dev->device->id))
+ if (!device_lookup_by_uuid(handler, dev->uuid))
device_handler_add_device(handler, dev);
/* move boot options from the context to the device */
}
}
+void device_handler_add_plugin_option(struct device_handler *handler,
+ struct plugin_option *opt)
+{
+ struct plugin_option *tmp;
+ unsigned int i;
+
+ for (i = 0; i < handler->n_plugins; i++) {
+ tmp = handler->plugins[i];
+ /* If both id and version match, ignore */
+ if (strncmp(opt->id, tmp->id, strlen(opt->id)) == 0 &&
+ strncmp(opt->version, tmp->version,
+ strlen(opt->version) == 0)) {
+ pb_log("discover: Plugin '%s' already exists, ignoring\n",
+ opt->id);
+ return;
+ }
+ }
+
+ handler->plugins = talloc_realloc(handler, handler->plugins,
+ struct plugin_option *, handler->n_plugins + 1);
+ if (!handler->plugins) {
+ pb_log("Failed to allocate memory for new plugin\n");
+ handler->n_plugins = 0;
+ return;
+ }
+
+ handler->plugins[handler->n_plugins++] = opt;
+ discover_server_notify_plugin_option_add(handler->server, opt);
+}
+
static void device_handler_update_lang(const char *lang)
{
const char *cur_lang;
static int device_handler_init_sources(struct device_handler *handler)
{
/* init our device sources: udev, network and user events */
- handler->udev = udev_init(handler, handler->waitset);
- if (!handler->udev)
+ handler->user_event = user_event_init(handler, handler->waitset);
+ if (!handler->user_event)
return -1;
handler->network = network_init(handler, handler->waitset,
if (!handler->network)
return -1;
- handler->user_event = user_event_init(handler, handler->waitset);
- if (!handler->user_event)
+ handler->udev = udev_init(handler, handler->waitset);
+ if (!handler->udev)
return -1;
return 0;
return;
}
- udev_reinit(handler->udev);
+ system_info_reinit();
network_shutdown(handler->network);
handler->network = network_init(handler, handler->waitset,
handler->dry_run);
+
+ udev_reinit(handler->udev);
}
static inline const char *get_device_path(struct discover_device *dev)
rc = try_mount(device_path, dev->mount_path, fstype,
MS_RDONLY | MS_SILENT, dev->ramdisk);
+ /* If mount fails clean up any snapshot and try again */
+ if (rc && dev->ramdisk) {
+ pb_log("couldn't mount snapshot for %s: mount failed: %s\n",
+ device_path, strerror(errno));
+ pb_log("falling back to actual device\n");
+
+ devmapper_destroy_snapshot(dev);
+
+ device_path = get_device_path(dev);
+ pb_log("mounting device %s read-only\n", dev->device_path);
+ rc = try_mount(device_path, dev->mount_path, fstype,
+ MS_RDONLY | MS_SILENT, dev->ramdisk);
+ }
+
if (!rc) {
dev->mounted = true;
dev->mounted_rw = false;
pb_log("couldn't mount device %s: mount failed: %s\n",
device_path, strerror(errno));
- /* If mount fails clean up any snapshot */
- devmapper_destroy_snapshot(dev);
-
pb_rmdir_recursive(mount_base(), dev->mount_path);
err_free:
talloc_free(dev->mount_path);
projects / petitboot / blobdiff