X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=5a5210e7956f6a5c707d12f13dff43b28220e756;hp=9c8dea8f47a1bc55293f807c5ba6cfae52652e7e;hb=a5dad9c05cd72820e64e0461889e9e77eaf8202d;hpb=43f340b66d8323c6e797868d07fc98482052ba35 diff --git a/discover/device-handler.c b/discover/device-handler.c index 9c8dea8..5a5210e 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -15,9 +16,11 @@ #include #include #include +#include #include "device-handler.h" #include "discover-server.h" +#include "user-event.h" #include "platform.h" #include "event.h" #include "parser.h" @@ -25,11 +28,17 @@ #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 +57,11 @@ 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); + +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) { @@ -259,6 +273,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 +288,43 @@ struct device_handler *device_handler_init(struct discover_server *server, parser_init(); + if (config_get()->safe_mode) + return handler; + + 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 +350,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 +384,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); @@ -393,6 +447,22 @@ static int default_option_priority(struct discover_boot_option *opt) 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) { @@ -401,6 +471,10 @@ static void set_default(struct device_handler *handler, 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 @@ -603,6 +677,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 @@ -736,7 +812,7 @@ void device_handler_cancel_default(struct device_handler *handler) 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); } @@ -744,11 +820,68 @@ void device_handler_cancel_default(struct device_handler *handler) void device_handler_update_config(struct device_handler *handler, struct config *config) { - config_set(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); } #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; @@ -831,9 +964,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, - "-t", fstype, "-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; @@ -841,8 +975,8 @@ static int mount_device(struct discover_device *dev) return 0; } - pb_log("couldn't mount device %s: mount failed with rc %d\n", - dev->device_path, rc); + 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: @@ -853,15 +987,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; @@ -886,8 +1019,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; @@ -901,13 +1035,29 @@ 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 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;