parser_init();
+ if (config_get()->safe_mode)
+ return handler;
+
rc = device_handler_init_sources(handler);
if (rc) {
talloc_free(handler);
return handler;
}
-static void device_handler_reinit(struct device_handler *handler)
+void device_handler_reinit(struct device_handler *handler)
{
struct discover_boot_option *opt, *tmp;
unsigned int i;
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]));
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);
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)
{
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
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
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);