]> git.ozlabs.org Git - petitboot/blobdiff - discover/device-handler.c
Various fixups and checks to make scan-build happy
[petitboot] / discover / device-handler.c
index aa61bd25ae92eb7fc28d0b0bc8e3177fb368f9b4..d85f1afdd22d3e05c46af12a6f5eaad2f583ec3e 100644 (file)
 #include "ipmi.h"
 
 enum default_priority {
-       DEFAULT_PRIORITY_REMOTE         = 1,
-       DEFAULT_PRIORITY_LOCAL_FIRST    = 2,
+       DEFAULT_PRIORITY_TEMP_USER      = 1,
+       DEFAULT_PRIORITY_REMOTE         = 2,
+       DEFAULT_PRIORITY_LOCAL_FIRST    = 3,
        DEFAULT_PRIORITY_LOCAL_LAST     = 0xfe,
        DEFAULT_PRIORITY_DISABLED       = 0xff,
 };
 
+static int default_rescan_timeout = 5 * 60; /* seconds */
+
 struct progress_info {
        unsigned int                    percentage;
        unsigned long                   size;           /* size in bytes */
@@ -57,6 +60,13 @@ struct progress_info {
        struct list_item        list;
 };
 
+struct crypt_info {
+       struct discover_device  *source_device;
+       char                    *dm_name;
+
+       struct list_item        list;
+};
+
 struct device_handler {
        struct discover_server  *server;
        int                     dry_run;
@@ -75,8 +85,10 @@ struct device_handler {
        struct waiter           *timeout_waiter;
        bool                    autoboot_enabled;
        unsigned int            sec_to_boot;
+       struct autoboot_option  *temp_autoboot;
 
        struct discover_boot_option *default_boot_option;
+       struct discover_boot_option *last_boot_option;
        int                     default_boot_option_priority;
 
        struct list             unresolved_boot_options;
@@ -90,6 +102,8 @@ struct device_handler {
        struct plugin_option    **plugins;
        unsigned int            n_plugins;
        bool                    plugin_installing;
+
+       struct list             crypt_devices;
 };
 
 static int mount_device(struct discover_device *dev);
@@ -260,9 +274,30 @@ void device_handler_destroy(struct device_handler *handler)
 static int destroy_device(void *arg)
 {
        struct discover_device *dev = arg;
+       struct process *p;
 
        umount_device(dev);
 
+       devmapper_destroy_snapshot(dev);
+
+       if (dev->crypt_device) {
+               const char *argv[] = {
+                       pb_system_apps.cryptsetup,
+                       "luksClose",
+                       dev->device->id,
+                       NULL
+               };
+
+               p = process_create(dev);
+               p->path = pb_system_apps.cryptsetup;
+               p->argv = argv;
+
+               if (process_run_async(p)) {
+                       pb_log("Failed to run cryptsetup\n");
+                       return -1;
+               }
+       }
+
        return 0;
 }
 
@@ -371,6 +406,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
        list_init(&handler->unresolved_boot_options);
 
        list_init(&handler->progress);
+       list_init(&handler->crypt_devices);
 
        /* set up our mount point base */
        pb_mkdir_recursive(mount_base());
@@ -394,6 +430,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
 void device_handler_reinit(struct device_handler *handler)
 {
        struct discover_boot_option *opt, *tmp;
+       struct crypt_info *crypt, *c;
        struct ramdisk_device *ramdisk;
        struct config *config;
        unsigned int i;
@@ -418,10 +455,13 @@ void device_handler_reinit(struct device_handler *handler)
 
        /* drop all devices */
        for (i = 0; i < handler->n_devices; i++) {
+               struct discover_device *device = handler->devices[i];
                discover_server_notify_device_remove(handler->server,
-                               handler->devices[i]->device);
-               ramdisk = handler->devices[i]->ramdisk;
-               talloc_free(handler->devices[i]);
+                               device->device);
+               ramdisk = device->ramdisk;
+               if (device->requery_waiter)
+                       waiter_remove(device->requery_waiter);
+               talloc_free(device);
                talloc_free(ramdisk);
        }
 
@@ -441,6 +481,11 @@ void device_handler_reinit(struct device_handler *handler)
 
        discover_server_notify_plugins_remove(handler->server);
 
+       /* forget encrypted devices */
+       list_for_each_entry_safe(&handler->crypt_devices, crypt, c, list)
+               talloc_free(crypt);
+       list_init(&handler->crypt_devices);
+
        set_env_variables(config_get());
 
        /* If the safe mode warning was active disable it now */
@@ -463,6 +508,9 @@ void device_handler_remove(struct device_handler *handler,
        struct discover_boot_option *opt, *tmp;
        unsigned int i;
 
+       if (device->requery_waiter)
+               waiter_remove(device->requery_waiter);
+
        list_for_each_entry_safe(&device->boot_options, opt, tmp, list) {
                if (opt == handler->default_boot_option) {
                        pb_log("Default option %s cancelled since device removed",
@@ -512,6 +560,7 @@ void device_handler_remove(struct device_handler *handler,
 void device_handler_status(struct device_handler *handler,
                struct status *status)
 {
+       pb_debug("%s: %s\n", __func__, status->message);
        discover_server_notify_boot_status(handler->server, status);
 }
 
@@ -523,6 +572,7 @@ static void _device_handler_vstatus(struct device_handler *handler,
        status.type = type;
        status.message = talloc_vasprintf(handler, fmt, ap);
        status.backlog = false;
+       status.boot_active = false;
 
        device_handler_status(handler, &status);
 
@@ -665,7 +715,7 @@ void device_handler_status_download(struct device_handler *handler,
        }
 
        if (!update) {
-               pb_log("%s: failed to allocate new status\n", __func__);
+               pb_log_fn("failed to allocate new status\n");
        } else {
                device_handler_status_info(handler, "%s\n", update);
                talloc_free(update);
@@ -702,7 +752,17 @@ void device_handler_status_download_remove(struct device_handler *handler,
 
 static void device_handler_boot_status_cb(void *arg, struct status *status)
 {
-       device_handler_status(arg, status);
+       struct device_handler *handler = arg;
+
+       /* boot had failed; update handler state to allow a new default if one
+        * is found later
+        */
+       if (status->type == STATUS_ERROR) {
+               handler->pending_boot = NULL;
+               handler->default_boot_option = NULL;
+       }
+
+       device_handler_status(handler, status);
 }
 
 static void countdown_status(struct device_handler *handler,
@@ -734,6 +794,8 @@ static int default_timeout(void *arg)
 
        opt = handler->default_boot_option;
 
+       handler->last_boot_option = opt;
+
        if (handler->sec_to_boot) {
                countdown_status(handler, opt, handler->sec_to_boot);
                handler->sec_to_boot--;
@@ -779,24 +841,31 @@ static bool ipmi_device_type_matches(enum ipmi_bootdev ipmi_type,
        return false;
 }
 
+static bool autoboot_option_matches(struct autoboot_option *opt,
+               struct discover_device *dev)
+{
+       if (opt->boot_type == BOOT_DEVICE_UUID)
+               if (!strcmp(opt->uuid, dev->uuid))
+                       return true;
+
+       if (opt->boot_type == BOOT_DEVICE_TYPE)
+               if (opt->type == dev->device->type ||
+                   opt->type == DEVICE_TYPE_ANY)
+                       return true;
+
+       return false;
+}
+
 static int autoboot_option_priority(const struct config *config,
                                struct discover_boot_option *opt)
 {
-       enum device_type type = opt->device->device->type;
-       const char *uuid = opt->device->uuid;
        struct autoboot_option *auto_opt;
        unsigned int i;
 
        for (i = 0; i < config->n_autoboot_opts; i++) {
                auto_opt = &config->autoboot_opts[i];
-               if (auto_opt->boot_type == BOOT_DEVICE_UUID)
-                       if (!strcmp(auto_opt->uuid, uuid))
-                               return DEFAULT_PRIORITY_LOCAL_FIRST + i;
-
-               if (auto_opt->boot_type == BOOT_DEVICE_TYPE)
-                       if (auto_opt->type == type ||
-                           auto_opt->type == DEVICE_TYPE_ANY)
-                               return DEFAULT_PRIORITY_LOCAL_FIRST + i;
+               if (autoboot_option_matches(auto_opt, opt->device))
+                       return DEFAULT_PRIORITY_LOCAL_FIRST + i;
        }
 
        return -1;
@@ -808,15 +877,27 @@ static int autoboot_option_priority(const struct config *config,
  * for these options.
  */
 static enum default_priority default_option_priority(
+               struct device_handler *handler,
                struct discover_boot_option *opt)
 {
        const struct config *config;
 
+       /* Temporary user-provided autoboot options have highest priority */
+       if (handler->temp_autoboot) {
+               if (autoboot_option_matches(handler->temp_autoboot,
+                                       opt->device))
+                       return DEFAULT_PRIORITY_TEMP_USER;
+
+               pb_debug("handler: disabled default priority due to "
+                               "temporary user override\n");
+               return DEFAULT_PRIORITY_DISABLED;
+       }
+
        config = config_get();
 
-       /* We give highest priority to IPMI-configured boot options. If
-        * we have an IPMI bootdev configuration set, then we don't allow
-        * any other defaults */
+       /* Next highest priority to IPMI-configured boot options. If we have an
+        * IPMI bootdev configuration set, then we don't allow any other
+        * defaults */
        if (config->ipmi_bootdev) {
                bool ipmi_match = ipmi_device_type_matches(config->ipmi_bootdev,
                                opt->device->device->type);
@@ -856,7 +937,7 @@ static void set_default(struct device_handler *handler,
 
        pb_debug("handler: new default option: %s\n", opt->option->id);
 
-       new_prio = default_option_priority(opt);
+       new_prio = default_option_priority(handler, opt);
 
        /* Anything outside our range prevents a default boot */
        if (new_prio >= DEFAULT_PRIORITY_DISABLED)
@@ -886,6 +967,10 @@ static void set_default(struct device_handler *handler,
                return;
        }
 
+       if (handler->default_boot_option)
+               handler->default_boot_option->option->is_autoboot_default = false;
+       opt->option->is_autoboot_default = true;
+
        handler->sec_to_boot = config_get()->autoboot_timeout_sec;
        handler->default_boot_option = opt;
        handler->default_boot_option_priority = new_prio;
@@ -896,6 +981,68 @@ static void set_default(struct device_handler *handler,
        default_timeout(handler);
 }
 
+static char *autoboot_option_desc(void *ctx, const struct autoboot_option *opt)
+{
+       const char *type, *val;
+
+       if (opt->boot_type == BOOT_DEVICE_TYPE) {
+               type = _("device type");
+               val = device_type_display_name(opt->type);
+       } else if (opt->boot_type == BOOT_DEVICE_UUID) {
+               type = _("device UUID");
+               val = opt->uuid;
+       } else {
+               type = _("unknown specifier");
+               val = NULL;
+       }
+
+       return talloc_asprintf(ctx, "%s = %s", type, val);
+}
+
+void device_handler_apply_temp_autoboot(struct device_handler *handler,
+               struct autoboot_option *opt)
+{
+       unsigned int i;
+       char *desc;
+
+       handler->temp_autoboot = talloc_steal(handler, opt);
+
+       desc = autoboot_option_desc(handler, opt);
+       device_handler_status_info(handler,
+                       _("Applying temporary autoboot override: %s"),
+                       desc);
+       talloc_free(desc);
+
+       if (!handler->autoboot_enabled)
+               return;
+
+       if (!handler->default_boot_option)
+               return;
+
+       if (autoboot_option_matches(opt, handler->default_boot_option->device))
+               return;
+
+       /* cancel the default, and rescan available options */
+       device_handler_cancel_default(handler);
+
+       handler->autoboot_enabled = true;
+
+       for (i = 0; i < handler->n_devices; i++) {
+               struct discover_device *dev = handler->devices[i];
+               struct discover_boot_option *boot_opt;
+
+               if (!autoboot_option_matches(opt, dev))
+                       continue;
+
+               list_for_each_entry(&dev->boot_options, boot_opt, list) {
+                       if (boot_opt->option->is_default) {
+                               set_default(handler, boot_opt);
+                               break;
+                       }
+               }
+       }
+}
+
 static bool resource_is_resolved(struct resource *res)
 {
        return !res || res->resolved;
@@ -1062,7 +1209,7 @@ void device_handler_add_ramdisk(struct device_handler *handler,
        }
 
        handler->ramdisks[i] = dev;
-       i = handler->n_ramdisks++;
+       handler->n_ramdisks++;
 }
 
 struct ramdisk_device *device_handler_get_ramdisk(
@@ -1120,6 +1267,116 @@ void device_handler_release_ramdisk(struct discover_device *device)
        device->ramdisk = NULL;
 }
 
+/*
+ * Check if a device name matches the name of an encrypted device that has been
+ * opened. If it matches remove it from the list and remove the original crypt
+ * discover device.
+ */
+bool device_handler_found_crypt_device(struct device_handler *handler,
+               const char *name)
+{
+       struct crypt_info *crypt, *c;
+
+       list_for_each_entry_safe(&handler->crypt_devices, crypt, c, list) {
+               if (!strncmp(crypt->dm_name, name, strlen(crypt->dm_name))) {
+                       device_handler_remove(handler, crypt->source_device);
+                       list_remove(&crypt->list);
+                       talloc_free(crypt);
+                       return true;
+               }
+       }
+
+       return false;
+}
+
+static void cryptsetup_cb(struct process *process)
+{
+       struct device_handler *handler = process->data;
+       struct crypt_info *crypt, *c;
+
+       if (process->exit_status == 0)
+               return;
+       device_handler_status_err(handler,
+                       _("Failed to open encrypted device %s"),
+                       process->argv[2]);
+
+       /*
+        * Failed to open the device; stop tracking it, but don't remove
+        * the source device.
+        */
+       list_for_each_entry_safe(&handler->crypt_devices, crypt, c, list) {
+               if (!strncmp(crypt->dm_name, process->argv[3],
+                                       strlen(crypt->dm_name))) {
+                       list_remove(&crypt->list);
+                       talloc_free(crypt);
+                       break;
+               }
+       }
+}
+
+void device_handler_open_encrypted_dev(struct device_handler *handler,
+               char *password, char *device_id)
+{
+       struct discover_device *dev;
+       struct crypt_info *crypt;
+       const char *device_path, **argv;
+       struct process *p;
+       char *name;
+       int result;
+
+       dev = device_lookup_by_id(handler, device_id);
+       if (!dev) {
+               pb_log_fn("Can't find device %s\n", device_id);
+               device_handler_status_err(handler,
+                               _("Encrypted device %s does not exist"),
+                               device_id);
+               return;
+       }
+
+       device_path = dev->device_path;
+       name = talloc_asprintf(handler, "luks_%s", device_id);
+
+       p = process_create(handler);
+       /* talloc argv under the process so we can access it in cryptsetup_cb */
+       argv = talloc_zero_array(p, const char *, 6);
+       argv[0] = talloc_strdup(argv, pb_system_apps.cryptsetup);
+       argv[1] = talloc_asprintf(argv, "luksOpen");
+       argv[2] = talloc_strdup(argv, device_path);
+       argv[3] = talloc_strdup(argv, name);
+       argv[4] = talloc_asprintf(argv, "-");
+       argv[5] = NULL;
+
+       p->path = pb_system_apps.cryptsetup;
+       p->argv = (const char **)argv;
+       p->exit_cb = cryptsetup_cb;
+       p->data = handler;
+       p->keep_stdout = true;
+       p->pipe_stdin = talloc_asprintf(p, "%s\n", password);
+
+       result = process_run_async(p);
+       if (result) {
+               pb_log("Failed to run cryptsetup\n");
+               return;
+       }
+
+       crypt = talloc(handler, struct crypt_info);
+       crypt->source_device = dev;
+       crypt->dm_name = name;
+       talloc_steal(crypt, name);
+       list_add(&handler->crypt_devices, &crypt->list);
+}
+
+void device_handler_add_encrypted_dev(struct device_handler *handler,
+               struct discover_device *dev)
+{
+       system_info_register_blockdev(dev->device->id, dev->uuid, "");
+       discover_server_notify_device_add(handler->server,
+                                         dev->device);
+       dev->notified = true;
+       if (!device_lookup_by_uuid(handler, dev->uuid))
+               device_handler_add_device(handler, dev);
+}
+
 /* Start discovery on a hotplugged device. The device will be in our devices
  * array, but has only just been initialised by the hotplug source.
  */
@@ -1165,15 +1422,131 @@ out:
        return 0;
 }
 
+struct requery_data {
+       struct device_handler   *handler;
+       struct discover_device  *device;
+};
+
+static int device_handler_requery_timeout_fn(void *data)
+{
+       struct discover_boot_option *opt, *tmp;
+       struct requery_data *rqd = data;
+       struct device_handler *handler;
+       struct discover_device *device;
+       bool autoboot;
+
+       handler = rqd->handler;
+       device = rqd->device;
+
+       talloc_free(rqd);
+
+       /* network_requery_device may re-add a timeout, so clear the device
+        * waiter here, so we can potentially start a new one. */
+       device->requery_waiter = NULL;
+
+       /* We keep the device around, but get rid of the parsed boot
+        * options on that device. That involves delaring out the lists,
+        * and potentially cancelling a default.
+        */
+       list_for_each_entry_safe(&handler->unresolved_boot_options,
+                       opt, tmp, list) {
+               if (opt->device != device)
+                       continue;
+               list_remove(&opt->list);
+               talloc_free(opt);
+       }
+
+       /* Track whether autoboot was enabled, if we cancel a default option
+        * it will be switched off.
+        */
+       autoboot = handler->autoboot_enabled;
+
+       list_for_each_entry_safe(&device->boot_options, opt, tmp, list) {
+               if (opt == handler->default_boot_option) {
+                       pb_log("Default option %s cancelled since device is being requeried\n",
+                                       opt->option->name);
+                       device_handler_cancel_default(handler);
+               }
+               list_remove(&opt->list);
+               talloc_free(opt);
+       }
+
+       handler->autoboot_enabled = autoboot;
+
+       discover_server_notify_device_remove(handler->server, device->device);
+       device->notified = false;
+
+       network_requery_device(handler->network, device);
+
+       return 0;
+}
+
+/* Schedule a requery in timeout (seconds).
+ *
+ * Special values of timeout:
+ *   0: no requery
+ *  -1: use default
+ */
+void device_handler_start_requery_timeout( struct device_handler *handler,
+               struct discover_device *dev, int timeout)
+{
+       struct requery_data *rqd;
+
+       if (dev->requery_waiter)
+               return;
+
+       if (timeout == -1)
+               timeout = default_rescan_timeout;
+       else if (timeout == 0)
+               return;
+
+       rqd = talloc(dev, struct requery_data);
+       rqd->handler = handler;
+       rqd->device = dev;
+
+       pb_debug("starting requery timeout for device %s, in %d sec\n",
+                       dev->device->id, timeout);
+
+       dev->requery_waiter = waiter_register_timeout(handler->waitset,
+                       timeout * 1000, device_handler_requery_timeout_fn, rqd);
+}
+
+static int event_requery_timeout(struct event *event)
+{
+       int timeout = -1;
+       unsigned long x;
+       const char *str;
+       char *endp;
+
+       if (!event)
+               return timeout;
+
+       str = event_get_param(event, "reboottime");
+       if (!str)
+               return timeout;
+
+       x = strtoul(str, &endp, 0);
+       if (endp != str)
+               timeout = x;
+
+       return timeout;
+}
+
+
 /* Incoming dhcp event */
 int device_handler_dhcp(struct device_handler *handler,
                struct discover_device *dev, struct event *event)
 {
        struct discover_context *ctx;
+       const char *ip;
+
+       if (event_get_param(event, "ipv6"))
+               ip = event_get_param(event, "ipv6");
+       else
+               ip = event_get_param(event, "ip");
 
        device_handler_status_dev_info(handler, dev,
-                       _("Processing DHCP lease response (ip: %s)"),
-                       event_get_param(event, "ip"));
+                       _("Processing DHCP lease response (ip: %s)"), ip);
 
        pending_network_jobs_start();
 
@@ -1182,6 +1555,9 @@ int device_handler_dhcp(struct device_handler *handler,
        talloc_steal(ctx, event);
        ctx->event = event;
 
+       device_handler_start_requery_timeout(handler, dev,
+                       event_requery_timeout(event));
+
        iterate_parsers(ctx);
 
        device_handler_discover_context_commit(handler, ctx);
@@ -1191,6 +1567,28 @@ int device_handler_dhcp(struct device_handler *handler,
        return 0;
 }
 
+struct discover_boot_option *device_handler_find_option_by_name(
+               struct device_handler *handler, const char *device,
+               const char *name)
+{
+       size_t len = strlen(name);
+       unsigned int i;
+
+       for (i = 0; i < handler->n_devices; i++) {
+               struct discover_device *dev = handler->devices[i];
+               struct discover_boot_option *opt;
+
+               list_for_each_entry(&dev->boot_options, opt, list)
+                       /* Match exactly, partial matches can be quite common */
+                       if (strlen(opt->option->name) == len &&
+                                       !strcmp(opt->option->name, name))
+                               if (!dev || !strcmp(opt->option->device_id, device))
+                                       return opt;
+       }
+
+       return NULL;
+}
+
 static struct discover_boot_option *find_boot_option_by_id(
                struct device_handler *handler, const char *id)
 {
@@ -1209,13 +1607,22 @@ static struct discover_boot_option *find_boot_option_by_id(
 }
 
 void device_handler_boot(struct device_handler *handler,
-               struct boot_command *cmd)
+               bool change_default, struct boot_command *cmd)
 {
        struct discover_boot_option *opt = NULL;
 
        if (cmd->option_id && strlen(cmd->option_id))
                opt = find_boot_option_by_id(handler, cmd->option_id);
 
+       /* Don't allow a normal client to change the default */
+       if (!change_default && handler->last_boot_option &&
+                       opt != handler->last_boot_option) {
+               pb_log("Non-root user tried to change boot option\n");
+               device_handler_status_err(handler,
+                               "Must be root to change default boot option\n");
+               return;
+       }
+
        if (handler->pending_boot)
                boot_cancel(handler->pending_boot);
 
@@ -1257,8 +1664,11 @@ void device_handler_update_config(struct device_handler *handler,
        int rc;
 
        rc = config_set(config);
-       if (rc)
+       if (rc) {
+               device_handler_status_err(handler,
+                               "Failed to update configuration!");
                return;
+       }
 
        discover_server_notify_config(handler->server, config);
        device_handler_update_lang(config->lang);
@@ -1268,32 +1678,44 @@ void device_handler_update_config(struct device_handler *handler,
 static char *device_from_addr(void *ctx, struct pb_url *url)
 {
        char *ipaddr, *buf, *tok, *dev = NULL;
+       bool ipv6_route;
        const char *delim = " ";
-       struct sockaddr_in *ip;
-       struct sockaddr_in si;
+       struct sockaddr_in *ipv4;
+       struct sockaddr_in6 *ipv6;
        struct addrinfo *res;
        struct process *p;
        int rc;
 
-       /* Note: IPv4 only */
-       rc = inet_pton(AF_INET, url->host, &(si.sin_addr));
-       if (rc > 0) {
-               ipaddr = url->host;
-       } else {
-               /* need to turn hostname into a valid IP */
-               rc = getaddrinfo(url->host, NULL, NULL, &res);
-               if (rc) {
-                       pb_debug("%s: Invalid URL\n",__func__);
-                       return NULL;
-               }
+       /* Confirm url->host is either a valid hostname, or a
+        * valid IPv4 or IPv6 address */
+       rc = getaddrinfo(url->host, NULL, NULL, &res);
+       if (rc) {
+               pb_debug("%s: Invalid URL\n",__func__);
+               return NULL;
+       }
+
+       switch (res->ai_family) {
+       case AF_INET:   /* ipv4 */
                ipaddr = talloc_array(ctx,char,INET_ADDRSTRLEN);
-               ip = (struct sockaddr_in *) res->ai_addr;
-               inet_ntop(AF_INET, &(ip->sin_addr), ipaddr, INET_ADDRSTRLEN);
+               ipv4 = (struct sockaddr_in *) res->ai_addr;
+               inet_ntop(AF_INET, &(ipv4->sin_addr), ipaddr, INET_ADDRSTRLEN);
+               ipv6_route = false;
+               break;
+       case AF_INET6:  /* ipv6 */
+               ipaddr = talloc_array(ctx,char,INET6_ADDRSTRLEN);
+               ipv6 = (struct sockaddr_in6 *) res->ai_addr;
+               inet_ntop(AF_INET6, &(ipv6->sin6_addr), ipaddr, INET6_ADDRSTRLEN);
+               ipv6_route = true;
+               break;
+       default:        /* error */
                freeaddrinfo(res);
+               return NULL;
        }
+       freeaddrinfo(res);
 
        const char *argv[] = {
                pb_system_apps.ip,
+               ipv6_route ? "-6" : "-4",
                "route", "show", "to", "match",
                ipaddr,
                NULL
@@ -1344,7 +1766,7 @@ static void process_url_cb(struct load_url_result *result, void *data)
        const char *mac;
 
        if (result->status != LOAD_OK) {
-               pb_log("%s: Load failed for %s\n", __func__, result->url->full);
+               pb_log_fn("Load failed for %s\n", result->url->full);
                return;
        }
 
@@ -1449,7 +1871,7 @@ static void plugin_install_cb(struct process *process)
        struct device_handler *handler = process->data;
 
        if (!handler) {
-               pb_log("%s: Missing data!\n", __func__);
+               pb_log_fn("Missing data!\n");
                return;
        }
 
@@ -1846,7 +2268,6 @@ static int umount_device(struct discover_device *dev)
                return -1;
 
        dev->mounted = false;
-       devmapper_destroy_snapshot(dev);
 
        pb_rmdir_recursive(mount_base(), dev->mount_path);
 
@@ -1982,7 +2403,7 @@ void device_handler_discover_context_commit(
                struct device_handler *handler __attribute__((unused)),
                struct discover_context *ctx __attribute__((unused)))
 {
-       pb_log("%s stubbed out for test cases\n", __func__);
+       pb_log_fn("stubbed out for test cases\n");
 }
 
 static void device_handler_update_lang(const char *lang __attribute__((unused)))