discover: Reject ADD_URL actions without configured network
[petitboot] / discover / device-handler.c
index af9fbba3e0dfbd3803772659c1adca6e377375d3..120f11f52aa819639ece6a1bffaa49d0772921ae 100644 (file)
@@ -1,4 +1,3 @@
-
 #include <assert.h>
 #include <stdlib.h>
 #include <stdbool.h>
 #include <assert.h>
 #include <stdlib.h>
 #include <stdbool.h>
@@ -6,10 +5,11 @@
 #include <string.h>
 #include <errno.h>
 #include <mntent.h>
 #include <string.h>
 #include <errno.h>
 #include <mntent.h>
+#include <locale.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <sys/stat.h>
 #include <sys/wait.h>
+#include <sys/mount.h>
 
 
-#include <pb-config/pb-config.h>
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
 #include <talloc/talloc.h>
 #include <list/list.h>
 #include <log/log.h>
 #include <system/system.h>
 #include <process/process.h>
 #include <url/url.h>
 #include <system/system.h>
 #include <process/process.h>
 #include <url/url.h>
+#include <i18n/i18n.h>
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netdb.h>
+#include <arpa/inet.h>
 
 #include "device-handler.h"
 #include "discover-server.h"
 
 #include "device-handler.h"
 #include "discover-server.h"
+#include "user-event.h"
+#include "platform.h"
 #include "event.h"
 #include "parser.h"
 #include "resource.h"
 #include "paths.h"
 #include "event.h"
 #include "parser.h"
 #include "resource.h"
 #include "paths.h"
+#include "sysinfo.h"
 #include "boot.h"
 #include "boot.h"
+#include "udev.h"
+#include "network.h"
 
 struct device_handler {
        struct discover_server  *server;
        int                     dry_run;
 
 
 struct device_handler {
        struct discover_server  *server;
        int                     dry_run;
 
+       struct pb_udev          *udev;
+       struct network          *network;
+       struct user_event       *user_event;
+
        struct discover_device  **devices;
        unsigned int            n_devices;
 
        struct discover_device  **devices;
        unsigned int            n_devices;
 
@@ -48,6 +63,11 @@ struct device_handler {
 static int mount_device(struct discover_device *dev);
 static int umount_device(struct discover_device *dev);
 
 static int mount_device(struct discover_device *dev);
 static int umount_device(struct discover_device *dev);
 
+static int device_handler_init_sources(struct device_handler *handler);
+static void device_handler_reinit_sources(struct device_handler *handler);
+
+static void device_handler_update_lang(const char *lang);
+
 void discover_context_add_boot_option(struct discover_context *ctx,
                struct discover_boot_option *boot_option)
 {
 void discover_context_add_boot_option(struct discover_context *ctx,
                struct discover_boot_option *boot_option)
 {
@@ -250,7 +270,7 @@ const char *discover_device_get_param(struct discover_device *device,
 
        list_for_each_entry(&device->params, param, list) {
                if (!strcmp(param->name, name))
 
        list_for_each_entry(&device->params, param, list) {
                if (!strcmp(param->name, name))
-                       return param->name;
+                       return param->value;
        }
        return NULL;
 }
        }
        return NULL;
 }
@@ -259,6 +279,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
                struct waitset *waitset, int dry_run)
 {
        struct device_handler *handler;
                struct waitset *waitset, int dry_run)
 {
        struct device_handler *handler;
+       int rc;
 
        handler = talloc_zero(NULL, struct device_handler);
        handler->server = server;
 
        handler = talloc_zero(NULL, struct device_handler);
        handler->server = server;
@@ -273,12 +294,47 @@ struct device_handler *device_handler_init(struct discover_server *server,
 
        parser_init();
 
 
        parser_init();
 
+       if (config_get()->safe_mode)
+               return handler;
+
+       rc = device_handler_init_sources(handler);
+       if (rc) {
+               talloc_free(handler);
+               return NULL;
+       }
+
        return handler;
 }
 
        return handler;
 }
 
+void device_handler_reinit(struct device_handler *handler)
+{
+       struct discover_boot_option *opt, *tmp;
+       unsigned int i;
+
+       device_handler_cancel_default(handler);
+
+       /* free unresolved boot options */
+       list_for_each_entry_safe(&handler->unresolved_boot_options,
+                       opt, tmp, list)
+               talloc_free(opt);
+       list_init(&handler->unresolved_boot_options);
+
+       /* drop all devices */
+       for (i = 0; i < handler->n_devices; i++)
+               discover_server_notify_device_remove(handler->server,
+                               handler->devices[i]->device);
+
+       talloc_free(handler->devices);
+       handler->devices = NULL;
+       handler->n_devices = 0;
+
+       device_handler_reinit_sources(handler);
+}
+
 void device_handler_remove(struct device_handler *handler,
                struct discover_device *device)
 {
 void device_handler_remove(struct device_handler *handler,
                struct discover_device *device)
 {
+       struct discover_boot_option *opt, *tmp;
        unsigned int i;
 
        for (i = 0; i < handler->n_devices; i++)
        unsigned int i;
 
        for (i = 0; i < handler->n_devices; i++)
@@ -290,6 +346,21 @@ void device_handler_remove(struct device_handler *handler,
                return;
        }
 
                return;
        }
 
+       /* Free any unresolved options, as they're currently allocated
+        * against the handler */
+       list_for_each_entry_safe(&handler->unresolved_boot_options,
+                       opt, tmp, list) {
+               if (opt->device != device)
+                       continue;
+               list_remove(&opt->list);
+               talloc_free(opt);
+       }
+
+       /* if this is a network device, we have to unregister it from the
+        * network code */
+       if (device->device->type == DEVICE_TYPE_NETWORK)
+               network_unregister_device(handler->network, device);
+
        handler->n_devices--;
        memmove(&handler->devices[i], &handler->devices[i + 1],
                (handler->n_devices - i) * sizeof(handler->devices[0]));
        handler->n_devices--;
        memmove(&handler->devices[i], &handler->devices[i + 1],
                (handler->n_devices - i) * sizeof(handler->devices[0]));
@@ -319,7 +390,7 @@ static void countdown_status(struct device_handler *handler,
        status.progress = -1;
        status.detail = NULL;
        status.message = talloc_asprintf(handler,
        status.progress = -1;
        status.detail = NULL;
        status.message = talloc_asprintf(handler,
-                       "Booting %s in %u sec", opt->option->name, sec);
+                       _("Booting in %d sec: %s"), sec, opt->option->name);
 
        discover_server_notify_boot_status(handler->server, &status);
 
 
        discover_server_notify_boot_status(handler->server, &status);
 
@@ -361,42 +432,71 @@ static int default_timeout(void *arg)
 static bool priority_match(struct boot_priority *prio,
                struct discover_boot_option *opt)
 {
 static bool priority_match(struct boot_priority *prio,
                struct discover_boot_option *opt)
 {
-       return prio->type == opt->device->device->type;
+       return prio->type == opt->device->device->type ||
+               prio->type == DEVICE_TYPE_ANY;
 }
 
 static int default_option_priority(struct discover_boot_option *opt)
 {
        const struct config *config;
        struct boot_priority *prio;
 }
 
 static int default_option_priority(struct discover_boot_option *opt)
 {
        const struct config *config;
        struct boot_priority *prio;
-       int i;
+       unsigned int i;
 
        config = config_get();
 
        for (i = 0; i < config->n_boot_priorities; i++) {
                prio = &config->boot_priorities[i];
                if (priority_match(prio, opt))
 
        config = config_get();
 
        for (i = 0; i < config->n_boot_priorities; i++) {
                prio = &config->boot_priorities[i];
                if (priority_match(prio, opt))
-                       break;
+                       return prio->priority;
        }
 
        }
 
-       return i;
+       return 0;
+}
+
+static bool device_allows_default(struct discover_device *dev)
+{
+       const char *dev_str;
+
+       dev_str = config_get()->boot_device;
+
+       if (!dev_str || !strlen(dev_str))
+               return true;
+
+       /* default devices are specified by UUIDs at present */
+       if (strcmp(dev->uuid, dev_str))
+               return false;
+
+       return true;
 }
 
 static void set_default(struct device_handler *handler,
                struct discover_boot_option *opt)
 {
 }
 
 static void set_default(struct device_handler *handler,
                struct discover_boot_option *opt)
 {
+       int new_prio;
+
        if (!handler->autoboot_enabled)
                return;
 
        if (!handler->autoboot_enabled)
                return;
 
+       /* do we allow default-booting from this device? */
+       if (!device_allows_default(opt->device))
+               return;
+
+       new_prio = default_option_priority(opt);
+
+       /* A negative priority indicates that we don't want to boot this device
+        * by default */
+       if (new_prio < 0)
+               return;
+
        /* Resolve any conflicts: if we have a new default option, it only
         * replaces the current if it has a higher priority. */
        if (handler->default_boot_option) {
        /* Resolve any conflicts: if we have a new default option, it only
         * replaces the current if it has a higher priority. */
        if (handler->default_boot_option) {
-               int new_prio, cur_prio;
+               int cur_prio;
 
 
-               new_prio = default_option_priority(opt);
                cur_prio = default_option_priority(
                                        handler->default_boot_option);
 
                cur_prio = default_option_priority(
                                        handler->default_boot_option);
 
-               if (new_prio < cur_prio) {
+               if (new_prio > cur_prio) {
                        handler->default_boot_option = opt;
                        /* extend the timeout a little, so the user sees some
                         * indication of the change */
                        handler->default_boot_option = opt;
                        /* extend the timeout a little, so the user sees some
                         * indication of the change */
@@ -440,7 +540,7 @@ static bool resource_resolve(struct resource *res, const char *name,
        if (resource_is_resolved(res))
                return true;
 
        if (resource_is_resolved(res))
                return true;
 
-       pb_log("Attempting to resolve resource %s->%s with parser %s\n",
+       pb_debug("Attempting to resolve resource %s->%s with parser %s\n",
                        opt->option->id, name, parser->name);
        parser->resolve_resource(handler, res);
 
                        opt->option->id, name, parser->name);
        parser->resolve_resource(handler, res);
 
@@ -502,13 +602,13 @@ static void process_boot_option_queue(struct device_handler *handler)
        list_for_each_entry_safe(&handler->unresolved_boot_options,
                        opt, tmp, list) {
 
        list_for_each_entry_safe(&handler->unresolved_boot_options,
                        opt, tmp, list) {
 
-               pb_log("queue: attempting resolution for %s\n",
+               pb_debug("queue: attempting resolution for %s\n",
                                opt->option->id);
 
                if (!boot_option_resolve(opt, handler))
                        continue;
 
                                opt->option->id);
 
                if (!boot_option_resolve(opt, handler))
                        continue;
 
-               pb_log("\tresolved!\n");
+               pb_debug("\tresolved!\n");
 
                list_remove(&opt->list);
                list_add_tail(&opt->device->boot_options, &opt->list);
 
                list_remove(&opt->list);
                list_add_tail(&opt->device->boot_options, &opt->list);
@@ -524,10 +624,8 @@ struct discover_context *device_handler_discover_context_create(
 {
        struct discover_context *ctx;
 
 {
        struct discover_context *ctx;
 
-       ctx = talloc(handler, struct discover_context);
+       ctx = talloc_zero(handler, struct discover_context);
        ctx->device = device;
        ctx->device = device;
-       ctx->conf_url = NULL;
-       ctx->test_data = NULL;
        list_init(&ctx->boot_options);
 
        return ctx;
        list_init(&ctx->boot_options);
 
        return ctx;
@@ -585,13 +683,15 @@ void device_handler_add_device(struct device_handler *handler,
                                struct discover_device *, handler->n_devices);
        handler->devices[handler->n_devices - 1] = device;
 
                                struct discover_device *, handler->n_devices);
        handler->devices[handler->n_devices - 1] = device;
 
+       if (device->device->type == DEVICE_TYPE_NETWORK)
+               network_register_device(handler->network, device);
 }
 
 /* Start discovery on a hotplugged device. The device will be in our devices
  * array, but has only just been initialised by the hotplug source.
  */
 int device_handler_discover(struct device_handler *handler,
 }
 
 /* Start discovery on a hotplugged device. The device will be in our devices
  * array, but has only just been initialised by the hotplug source.
  */
 int device_handler_discover(struct device_handler *handler,
-               struct discover_device *dev, enum conf_method method)
+               struct discover_device *dev)
 {
        struct discover_context *ctx;
        int rc;
 {
        struct discover_context *ctx;
        int rc;
@@ -605,8 +705,12 @@ int device_handler_discover(struct device_handler *handler,
        if (rc)
                goto out;
 
        if (rc)
                goto out;
 
+       /* add this device to our system info */
+       system_info_register_blockdev(dev->device->id, dev->uuid,
+                       dev->mount_path);
+
        /* run the parsers. This will populate the ctx's boot_option list. */
        /* run the parsers. This will populate the ctx's boot_option list. */
-       iterate_parsers(ctx, method);
+       iterate_parsers(ctx);
 
        /* add discovered stuff to the handler */
        device_handler_discover_context_commit(handler, ctx);
 
        /* add discovered stuff to the handler */
        device_handler_discover_context_commit(handler, ctx);
@@ -617,18 +721,17 @@ out:
        return 0;
 }
 
        return 0;
 }
 
-/* incoming conf event */
-int device_handler_conf(struct device_handler *handler,
-               struct discover_device *dev, struct pb_url *url,
-               enum conf_method method)
+/* Incoming dhcp event */
+int device_handler_dhcp(struct device_handler *handler,
+               struct discover_device *dev, struct event *event)
 {
        struct discover_context *ctx;
 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);
 {
        struct discover_context *ctx;
 
        /* create our context */
        ctx = device_handler_discover_context_create(handler, dev);
-       ctx->conf_url = url;
+       ctx->event = event;
 
 
-       iterate_parsers(ctx, method);
+       iterate_parsers(ctx);
 
        device_handler_discover_context_commit(handler, ctx);
 
 
        device_handler_discover_context_commit(handler, ctx);
 
@@ -637,6 +740,25 @@ int device_handler_conf(struct device_handler *handler,
        return 0;
 }
 
        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;
+
+        /* 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);
+
+        talloc_free(ctx);
+
+        return 0;
+}
+
 static struct discover_boot_option *find_boot_option_by_id(
                struct device_handler *handler, const char *id)
 {
 static struct discover_boot_option *find_boot_option_by_id(
                struct device_handler *handler, const char *id)
 {
@@ -696,12 +818,211 @@ void device_handler_cancel_default(struct device_handler *handler)
        status.type = BOOT_STATUS_INFO;
        status.progress = -1;
        status.detail = NULL;
        status.type = BOOT_STATUS_INFO;
        status.progress = -1;
        status.detail = NULL;
-       status.message = "Default boot cancelled";
+       status.message = _("Default boot cancelled");
 
        discover_server_notify_boot_status(handler->server, &status);
 }
 
 
        discover_server_notify_boot_status(handler->server, &status);
 }
 
+void device_handler_update_config(struct device_handler *handler,
+               struct config *config)
+{
+       int rc;
+
+       rc = config_set(config);
+       if (rc)
+               return;
+
+       discover_server_notify_config(handler->server, config);
+       device_handler_update_lang(config->lang);
+       device_handler_reinit(handler);
+}
+
+static char *device_from_addr(void *ctx, struct pb_url *url)
+{
+       char *ipaddr, *buf, *tok, *dev = NULL;
+       const char *delim = " ";
+       struct sockaddr_in *ip;
+       struct sockaddr_in si;
+       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;
+               }
+               ipaddr = talloc_array(ctx,char,INET_ADDRSTRLEN);
+               ip = (struct sockaddr_in *) res->ai_addr;
+               inet_ntop(AF_INET, &(ip->sin_addr), ipaddr, INET_ADDRSTRLEN);
+               freeaddrinfo(res);
+       }
+
+       const char *argv[] = {
+               pb_system_apps.ip,
+               "route", "show", "to", "match",
+               ipaddr,
+               NULL
+       };
+
+       p = process_create(ctx);
+
+       p->path = pb_system_apps.ip;
+       p->argv = argv;
+       p->keep_stdout = true;
+
+       rc = process_run_sync(p);
+
+       if (rc) {
+               /* ip has complained for some reason; most likely
+                * there is no route to the host - bail out */
+               pb_debug("%s: No route to %s\n",__func__,url->host);
+               return NULL;
+       }
+
+       buf = p->stdout_buf;
+       /* If a route is found, ip-route output will be of the form
+        * "... dev DEVNAME ... " */
+       tok = strtok(buf, delim);
+       while (tok) {
+               if (!strcmp(tok, "dev")) {
+                       tok = strtok(NULL, delim);
+                       dev = talloc_strdup(ctx, tok);
+                       break;
+               }
+               tok = strtok(NULL, delim);
+       }
+
+       process_release(p);
+       if (dev)
+               pb_debug("%s: Found interface '%s'\n", __func__,dev);
+       return dev;
+}
+
+
+void device_handler_process_url(struct device_handler *handler,
+               const char *url)
+{
+       struct discover_context *ctx;
+       struct discover_device *dev;
+       struct boot_status *status;
+       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);
+
+       if (!handler->network) {
+               status->message = talloc_asprintf(handler,
+                                       _("No network configured"));
+               goto msg;
+       }
+
+       event = talloc(handler, struct event);
+       event->type = EVENT_TYPE_USER;
+       event->action = EVENT_ACTION_CONF;
+
+       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->host) {
+               status->message = talloc_asprintf(handler,
+                                       _("Invalid config URL!"));
+               goto msg;
+       }
+
+       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;
+       }
+
+       dev = discover_device_create(handler, event->device);
+       ctx = device_handler_discover_context_create(handler, dev);
+       ctx->event = event;
+
+       iterate_parsers(ctx);
+
+       device_handler_discover_context_commit(handler, ctx);
+
+       talloc_free(ctx);
+
+       status->type = BOOT_STATUS_INFO;
+       status->message = talloc_asprintf(status, _("Config file %s parsed"),
+                                       pb_url->file);
+msg:
+       boot_status(handler, status);
+       talloc_free(status);
+}
+
 #ifndef PETITBOOT_TEST
 #ifndef PETITBOOT_TEST
+
+static void device_handler_update_lang(const char *lang)
+{
+       const char *cur_lang;
+
+       if (!lang)
+               return;
+
+       cur_lang = setlocale(LC_ALL, NULL);
+       if (cur_lang && !strcmp(cur_lang, lang))
+               return;
+
+       setlocale(LC_ALL, 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)
+               return -1;
+
+       handler->network = network_init(handler, handler->waitset,
+                       handler->dry_run);
+       if (!handler->network)
+               return -1;
+
+       handler->user_event = user_event_init(handler, handler->waitset);
+       if (!handler->user_event)
+               return -1;
+
+       return 0;
+}
+
+static void device_handler_reinit_sources(struct device_handler *handler)
+{
+       /* if we haven't initialised sources previously (becuase we started in
+        * safe mode), then init once here. */
+       if (!(handler->udev || handler->network || handler->user_event)) {
+               device_handler_init_sources(handler);
+               return;
+       }
+
+       udev_reinit(handler->udev);
+
+       network_shutdown(handler->network);
+       handler->network = network_init(handler, handler->waitset,
+                       handler->dry_run);
+}
+
 static bool check_existing_mount(struct discover_device *dev)
 {
        struct stat devstat, mntstat;
 static bool check_existing_mount(struct discover_device *dev)
 {
        struct stat devstat, mntstat;
@@ -759,6 +1080,7 @@ static bool check_existing_mount(struct discover_device *dev)
 
 static int mount_device(struct discover_device *dev)
 {
 
 static int mount_device(struct discover_device *dev)
 {
+       const char *fstype;
        int rc;
 
        if (!dev->device_path)
        int rc;
 
        if (!dev->device_path)
@@ -770,6 +1092,10 @@ static int mount_device(struct discover_device *dev)
        if (check_existing_mount(dev))
                return 0;
 
        if (check_existing_mount(dev))
                return 0;
 
+       fstype = discover_device_get_param(dev, "ID_FS_TYPE");
+       if (!fstype)
+               return 0;
+
        dev->mount_path = join_paths(dev, mount_base(),
                                        dev->device_path);
 
        dev->mount_path = join_paths(dev, mount_base(),
                                        dev->device_path);
 
@@ -779,9 +1105,10 @@ static int mount_device(struct discover_device *dev)
                goto err_free;
        }
 
                goto err_free;
        }
 
-       rc = process_run_simple(dev, pb_system_apps.mount,
-                       dev->device_path, dev->mount_path,
-                       "-o", "ro", NULL);
+       pb_log("mounting device %s read-only\n", dev->device_path);
+       errno = 0;
+       rc = mount(dev->device_path, dev->mount_path, fstype,
+                       MS_RDONLY | MS_SILENT, "");
        if (!rc) {
                dev->mounted = true;
                dev->mounted_rw = false;
        if (!rc) {
                dev->mounted = true;
                dev->mounted_rw = false;
@@ -789,16 +1116,8 @@ static int mount_device(struct discover_device *dev)
                return 0;
        }
 
                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: %s\n",
+                       dev->device_path, strerror(errno));
 
        pb_rmdir_recursive(mount_base(), dev->mount_path);
 err_free:
 
        pb_rmdir_recursive(mount_base(), dev->mount_path);
 err_free:
@@ -809,15 +1128,14 @@ err_free:
 
 static int umount_device(struct discover_device *dev)
 {
 
 static int umount_device(struct discover_device *dev)
 {
-       int status;
+       int rc;
 
        if (!dev->mounted || !dev->unmount)
                return 0;
 
 
        if (!dev->mounted || !dev->unmount)
                return 0;
 
-       status = process_run_simple(dev, pb_system_apps.umount,
-                       dev->mount_path, NULL);
-
-       if (!WIFEXITED(status) || WEXITSTATUS(status) != 0)
+       pb_log("unmounting device %s\n", dev->device_path);
+       rc = umount(dev->mount_path);
+       if (rc)
                return -1;
 
        dev->mounted = false;
                return -1;
 
        dev->mounted = false;
@@ -842,8 +1160,9 @@ int device_request_write(struct discover_device *dev, bool *release)
        if (dev->mounted_rw)
                return 0;
 
        if (dev->mounted_rw)
                return 0;
 
-       rc = process_run_simple(dev, pb_system_apps.mount, dev->mount_path,
-                       "-o", "remount,rw", NULL);
+       pb_log("remounting device %s read-write\n", dev->device_path);
+       rc = mount(dev->device_path, dev->mount_path, "",
+                       MS_REMOUNT | MS_SILENT, "");
        if (rc)
                return -1;
 
        if (rc)
                return -1;
 
@@ -857,13 +1176,29 @@ void device_release_write(struct discover_device *dev, bool release)
        if (!release)
                return;
 
        if (!release)
                return;
 
-       process_run_simple(dev, pb_system_apps.mount, dev->mount_path,
-                       "-o", "remount,ro", NULL);
+       pb_log("remounting device %s read-only\n", dev->device_path);
+       mount(dev->device_path, dev->mount_path, "",
+                       MS_REMOUNT | MS_RDONLY | MS_SILENT, "");
        dev->mounted_rw = false;
 }
 
 #else
 
        dev->mounted_rw = false;
 }
 
 #else
 
+static void device_handler_update_lang(const char *lang __attribute__((unused)))
+{
+}
+
+static int device_handler_init_sources(
+               struct device_handler *handler __attribute__((unused)))
+{
+       return 0;
+}
+
+static void device_handler_reinit_sources(
+               struct device_handler *handler __attribute__((unused)))
+{
+}
+
 static int umount_device(struct discover_device *dev __attribute__((unused)))
 {
        return 0;
 static int umount_device(struct discover_device *dev __attribute__((unused)))
 {
        return 0;