X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=c31fceaf5a11b1ac22c28f50ad530866f4b7f23e;hp=e230e7669ac31e3c4e04a35b35cf71be8155eb81;hb=d2bb9b5a636753586e9d6b2b3606770a2bff6a11;hpb=4a9727c96f4e7b6e7cc237e737441bfae83a7a80

diff --git a/discover/device-handler.c b/discover/device-handler.c
index e230e76..c31fcea 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -359,6 +359,15 @@ void device_handler_remove(struct device_handler *handler,
 	struct discover_boot_option *opt, *tmp;
 	unsigned int i;
 
+	list_for_each_entry_safe(&device->boot_options, opt, tmp, list) {
+		if (opt == handler->default_boot_option) {
+			pb_log("Default option %s cancelled since device removed",
+					opt->option->name);
+			device_handler_cancel_default(handler);
+			break;
+		}
+	}
+
 	for (i = 0; i < handler->n_devices; i++)
 		if (handler->devices[i] == device)
 			break;
@@ -1572,6 +1581,41 @@ void device_release_write(struct discover_device *dev, bool release)
 		dev->mounted = true;
 }
 
+void device_sync_snapshots(struct device_handler *handler, const char *device)
+{
+	struct discover_device *dev = NULL;
+	unsigned int i;
+
+	if (device) {
+		/* Find matching device and sync */
+		dev = device_lookup_by_name(handler, device);
+		if (!dev) {
+			pb_log("%s: device name '%s' unrecognised\n",
+				__func__, device);
+			return;
+		}
+		if (dev->ramdisk)
+			device_release_write(dev, true);
+		else
+			pb_log("%s has no snapshot to merge, skipping\n",
+				dev->device->id);
+		return;
+	}
+
+	/* Otherwise sync all relevant devices */
+	for (i = 0; i < handler->n_devices; i++) {
+		dev = handler->devices[i];
+		if (dev->device->type != DEVICE_TYPE_DISK &&
+			dev->device->type != DEVICE_TYPE_USB)
+			continue;
+		if (dev->ramdisk)
+			device_release_write(dev, true);
+		else
+			pb_log("%s has no snapshot to merge, skipping\n",
+				dev->device->id);
+	}
+}
+
 #else
 
 void device_handler_discover_context_commit(
@@ -1619,4 +1663,10 @@ void device_release_write(struct discover_device *dev __attribute__((unused)),
 {
 }
 
+void device_sync_snapshots(
+		struct device_handler *handler __attribute__((unused)),
+		const char *device __attribute__((unused)))
+{
+}
+
 #endif