X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=b93cdfa1130cc5c956e6608a997c118a3786cd08;hp=d3256fa58321ee910cb546d282ff5f05ad0de4b9;hb=1860aac29624b1cb292a7ca549dc063bcd3f9bb6;hpb=d27570168fd6d5a2144553002c8082ae626b7e84 diff --git a/discover/device-handler.c b/discover/device-handler.c index d3256fa..b93cdfa 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -7,8 +7,8 @@ #include #include #include +#include -#include #include #include #include @@ -19,17 +19,25 @@ #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 "sysinfo.h" #include "boot.h" +#include "udev.h" +#include "network.h" 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; @@ -48,6 +56,9 @@ struct device_handler { 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); + void discover_context_add_boot_option(struct discover_context *ctx, struct discover_boot_option *boot_option) { @@ -250,7 +261,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; } @@ -259,6 +270,7 @@ struct device_handler *device_handler_init(struct discover_server *server, struct waitset *waitset, int dry_run) { struct device_handler *handler; + int rc; handler = talloc_zero(NULL, struct device_handler); handler->server = server; @@ -273,9 +285,40 @@ struct device_handler *device_handler_init(struct discover_server *server, parser_init(); + rc = device_handler_init_sources(handler); + if (rc) { + talloc_free(handler); + return NULL; + } + 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) { @@ -301,6 +344,11 @@ void device_handler_remove(struct device_handler *handler, 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])); @@ -330,7 +378,7 @@ static void countdown_status(struct device_handler *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); @@ -372,7 +420,8 @@ static int default_timeout(void *arg) 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) @@ -386,28 +435,56 @@ static int default_option_priority(struct discover_boot_option *opt) 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) { + int new_prio; + 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) { - int new_prio, cur_prio; + int cur_prio; - new_prio = default_option_priority(opt); 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 */ @@ -594,6 +671,8 @@ void device_handler_add_device(struct device_handler *handler, 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 @@ -737,9 +816,39 @@ void device_handler_update_config(struct device_handler *handler, { config_set(config); discover_server_notify_config(handler->server, config); + device_handler_reinit(handler); } #ifndef PETITBOOT_TEST + +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) +{ + 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; @@ -797,6 +906,7 @@ static bool check_existing_mount(struct discover_device *dev) static int mount_device(struct discover_device *dev) { + const char *fstype; int rc; if (!dev->device_path) @@ -808,6 +918,10 @@ static int mount_device(struct discover_device *dev) 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); @@ -817,9 +931,10 @@ static int mount_device(struct discover_device *dev) 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; @@ -827,16 +942,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: %s\n", + dev->device_path, strerror(errno)); pb_rmdir_recursive(mount_base(), dev->mount_path); err_free: @@ -847,15 +954,14 @@ err_free: static int umount_device(struct discover_device *dev) { - int status; + int rc; 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; @@ -880,8 +986,9 @@ int device_request_write(struct discover_device *dev, bool *release) 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; @@ -895,13 +1002,25 @@ void device_release_write(struct discover_device *dev, bool release) 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 +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;