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

diff --git a/discover/device-handler.c b/discover/device-handler.c
index f5dc32c..e4978fa 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -285,6 +285,9 @@ 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);
@@ -294,7 +297,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 +347,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 +381,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);
 
@@ -436,6 +444,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)
 {
@@ -444,6 +468,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
@@ -646,6 +674,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
@@ -815,6 +845,13 @@ static int device_handler_init_sources(struct device_handler *handler)
 
 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);