X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=7f7081df5f6fc27abd033788d2202c5cca1988c2;hb=e19c5fe83174de749843bb8486a0d12c25adcb82;hp=f5dc32c7abcb4f2239980b1c5a837fd2dd60cc2b;hpb=310de3ab00b77b09a897b93ed0272b82ebc4f73b;p=petitboot

diff --git a/discover/device-handler.c b/discover/device-handler.c
index f5dc32c..7f7081d 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -294,7 +294,7 @@ struct device_handler *device_handler_init(struct discover_server *server,
 	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;
@@ -344,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]));
@@ -373,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);
 
@@ -646,6 +651,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