X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=9868e5112c419d2c8faad2ec34e9fdd25919830f;hp=4f7a7b7500c4fee446747df10861095d30b2ce33;hb=77108275fe6c5cefa1b7d330a3acf48c12275230;hpb=acc5ace6e58db2f3dceb1f7a27d0fc1fb29c4a27

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 4f7a7b7..9868e51 100644
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -457,6 +457,7 @@ struct {
 } device_type_map[] = {
 	{ IPMI_BOOTDEV_NETWORK, DEVICE_TYPE_NETWORK },
 	{ IPMI_BOOTDEV_DISK, DEVICE_TYPE_DISK },
+	{ IPMI_BOOTDEV_DISK, DEVICE_TYPE_USB },
 	{ IPMI_BOOTDEV_CDROM, DEVICE_TYPE_OPTICAL },
 };
 
@@ -861,7 +862,13 @@ int device_handler_discover(struct device_handler *handler,
 
 	status = talloc_zero(handler, struct boot_status);
 	status->type = BOOT_STATUS_INFO;
-	status->message = talloc_asprintf(status, "Processing %s device %s",
+	/*
+	 * TRANSLATORS: this string will be passed the type and identifier
+	 * of the device. For example, the first parameter could be "Disk",
+	 * (which will be translated accordingly) and the second a Linux device
+	 * identifier like 'sda1' (which will not be translated)
+	 */
+	status->message = talloc_asprintf(status, _("Processing %s device %s"),
 				device_type_display_name(dev->device->type),
 				dev->device->id);
 	boot_status(handler, status);
@@ -886,7 +893,11 @@ int device_handler_discover(struct device_handler *handler,
 	device_handler_discover_context_commit(handler, ctx);
 
 out:
-	status->message = talloc_asprintf(status,"Processing %s complete\n",
+	/*
+	 * TRANSLATORS: the format specifier in this string is a Linux
+	 * device identifier, like 'sda1'
+	 */
+	status->message = talloc_asprintf(status,_("Processing %s complete\n"),
 				dev->device->id);
 	boot_status(handler, status);
 
@@ -905,7 +916,11 @@ int device_handler_dhcp(struct device_handler *handler,
 
 	status = talloc_zero(handler, struct boot_status);
 	status->type = BOOT_STATUS_INFO;
-	status->message = talloc_asprintf(status, "Processing dhcp event on %s",
+	/*
+	 * TRANSLATORS: this format specifier will be the name of a network
+	 * device, like 'eth0'.
+	 */
+	status->message = talloc_asprintf(status, _("Processing dhcp event on %s"),
 				dev->device->id);
 	boot_status(handler, status);
 
@@ -917,7 +932,11 @@ int device_handler_dhcp(struct device_handler *handler,
 
 	device_handler_discover_context_commit(handler, ctx);
 
-	status->message = talloc_asprintf(status,"Processing %s complete\n",
+	/*
+	 * TRANSLATORS: this format specifier will be the name of a network
+	 * device, like 'eth0'.
+	 */
+	status->message = talloc_asprintf(status,_("Processing %s complete\n"),
 				dev->device->id);
 	boot_status(handler, status);
 
@@ -936,7 +955,7 @@ int device_handler_conf(struct device_handler *handler,
 
 	status = talloc_zero(handler, struct boot_status);
 	status->type = BOOT_STATUS_INFO;
-	status->message = talloc_asprintf(status, "Processing user config");
+	status->message = talloc_asprintf(status, _("Processing user config"));
 	boot_status(handler, status);
 
 	/* create our context */
@@ -948,7 +967,7 @@ int device_handler_conf(struct device_handler *handler,
 	device_handler_discover_context_commit(handler, ctx);
 
 	status->message = talloc_asprintf(status,
-				"Processing user config complete");
+				_("Processing user config complete"));
 	boot_status(handler, status);
 
 	talloc_free(status);
@@ -1224,16 +1243,26 @@ static void device_handler_reinit_sources(struct device_handler *handler)
 			handler->dry_run);
 }
 
-static const char *fs_parameters(unsigned int rw_flags, const char *fstype)
+static const char *fs_parameters(struct discover_device *dev,
+				 unsigned int rw_flags)
 {
+	const char *fstype = discover_device_get_param(dev, "ID_FS_TYPE");
+
+	/* XFS journals are not cross-endian compatible; don't try recovery
+	 * even if we have a snapshot */
+	if (!strncmp(fstype, "xfs", strlen("xfs")))
+		return "norecovery";
+
+	/* If we have a snapshot available allow touching the filesystem */
+	if (dev->ramdisk)
+		return "";
+
 	if ((rw_flags | MS_RDONLY) != MS_RDONLY)
 		return "";
 
-	/* Avoid writing back to the disk on journaled filesystems */
+	/* Avoid writes due to journal replay if we don't have a snapshot */
 	if (!strncmp(fstype, "ext4", strlen("ext4")))
 		return "norecovery";
-	if (!strncmp(fstype, "xfs", strlen("xfs")))
-		return "norecovery";
 
 	return "";
 }
@@ -1341,7 +1370,7 @@ static int mount_device(struct discover_device *dev)
 	errno = 0;
 	rc = mount(device_path, dev->mount_path, fstype,
 			MS_RDONLY | MS_SILENT,
-			fs_parameters(MS_RDONLY, fstype));
+			fs_parameters(dev, MS_RDONLY));
 	if (!rc) {
 		dev->mounted = true;
 		dev->mounted_rw = false;
@@ -1421,7 +1450,7 @@ int device_request_write(struct discover_device *dev, bool *release)
 
 	rc = mount(device_path, dev->mount_path, fstype,
 			MS_SILENT,
-			fs_parameters(MS_REMOUNT, fstype));
+			fs_parameters(dev, MS_REMOUNT));
 	if (rc)
 		goto mount_ro;
 
@@ -1434,7 +1463,7 @@ mount_ro:
 	       device_path, strerror(errno));
 	if (mount(device_path, dev->mount_path, fstype,
 			MS_RDONLY | MS_SILENT,
-			fs_parameters(MS_RDONLY, fstype)))
+			fs_parameters(dev, MS_RDONLY)))
 		pb_log("Unable to recover mount for %s: %s\n",
 		       device_path, strerror(errno));
 	return -1;
@@ -1468,7 +1497,7 @@ void device_release_write(struct discover_device *dev, bool release)
 
 	mount(device_path, dev->mount_path, fstype,
 			MS_RDONLY | MS_SILENT,
-			fs_parameters(MS_RDONLY, fstype));
+			fs_parameters(dev, MS_RDONLY));
 	if (rc)
 		pb_log("Failed to remount %s read-only: %s\n",
 		       device_path, strerror(errno));