X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=discover%2Fdevice-handler.c;h=4e25e079ca18185e21ec187e57a5cd09f9315e0f;hb=5acb43464206348b7cced9508852fdd2989aea58;hp=4f7a7b7500c4fee446747df10861095d30b2ce33;hpb=acc5ace6e58db2f3dceb1f7a27d0fc1fb29c4a27;p=petitboot

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 4f7a7b7..4e25e07 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 },
 };
 
@@ -1224,16 +1225,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 +1352,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 +1432,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 +1445,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 +1479,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));