discover: Use ID_FS_TYPE property for filesystem type detection

[petitboot] / discover / device-handler.c

diff --git a/discover/device-handler.c b/discover/device-handler.c
index 80187ff49474a186cfb5b7e5bb7bceb0f4209404..9c8dea8f47a1bc55293f807c5ba6cfae52652e7e 100644 (file)
--- a/discover/device-handler.c
+++ b/discover/device-handler.c
@@ -806,6 +806,7 @@ static bool check_existing_mount(struct discover_device *dev)
 
 static int mount_device(struct discover_device *dev)
 {
+       const char *fstype;
        int rc;
 
        if (!dev->device_path)
@@ -817,6 +818,10 @@ static int mount_device(struct discover_device *dev)
        if (check_existing_mount(dev))
                return 0;
 
+       fstype = discover_device_get_param(dev, "ID_FS_TYPE");
+       if (!fstype)
+               return 0;
+
        dev->mount_path = join_paths(dev, mount_base(),
                                        dev->device_path);
 
@@ -828,7 +833,7 @@ static int mount_device(struct discover_device *dev)
 
        rc = process_run_simple(dev, pb_system_apps.mount,
                        dev->device_path, dev->mount_path,
-                       "-o", "ro", NULL);
+                       "-t", fstype, "-o", "ro", NULL);
        if (!rc) {
                dev->mounted = true;
                dev->mounted_rw = false;