From ffd45d635aea4f05dff511515eae85b0d9e08ab0 Mon Sep 17 00:00:00 2001
From: Thomas Lavocat <tlavocat@redhat.com>
Date: Thu, 26 Jan 2023 17:09:26 +0100
Subject: [PATCH] tools/image-info: mount with the mount options

Before the new version of image-info was ignoring the mount options for
the devices leading to errors in the resulting json.
---
 tools/image-info | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/tools/image-info b/tools/image-info
index 5daeb08da..4f92ade20 100755
--- a/tools/image-info
+++ b/tools/image-info
@@ -2632,8 +2632,13 @@ def append_partitions(report, image):
                 info = index.get_module_info("Mount", "org.osbuild.xfs")
             else:
                 raise RuntimeError("Unknown file system")
-            options = { "readonly":True }
-
+            options = {"readonly": True}
+            for option in part_options:
+                if "=" in option:
+                    parts = option.split("=")
+                    options[parts[0]] = parts[1]
+                else:
+                    options[option] = True
 
             # the first mount point should be root
             if n == 0: