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);
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