elbepack: hdimg: pass mount options

For some use cases, like compression, it's essential to apply the mount
options not only during runtime, but also during creation of the images.

Signed-off-by: Daniel Braunwarth <[email protected]>
Signed-off-by: Thomas Weißschuh <[email protected]>

Author: d4nuu8

elbepack/hdimg.py

@@ -164,7 +164,9 @@ def install(self, target, user_args):
 
                 for entry in self.fs.depthlist():
                     stack.enter_context(
-                        mount(f'{loopdev}p{entry.partnum}', imagemntfs.fname(entry.mountpoint)))
+                        mount(f'{loopdev}p{entry.partnum}',
+                              imagemntfs.fname(entry.mountpoint),
+                              options=entry.options))
 
                 for bindmnt in ['/dev', '/proc', '/sys']:
                     stack.enter_context(
@@ -215,7 +217,9 @@ def install(self, target, user_args):
                         bootentry_label = entry.label
                         bootentry = int(entry.partnum)
                     stack.enter_context(
-                        mount(f'{loopdev}p{entry.partnum}', imagemntfs.fname(entry.mountpoint)))
+                        mount(f'{loopdev}p{entry.partnum}',
+                              imagemntfs.fname(entry.mountpoint),
+                              options=entry.options))
 
                 if not bootentry:
                     bootentry_label = entry.label
@@ -308,7 +312,7 @@ def create_label(disk, part, ppart, fslabel, target, grub):
 
         mount_path = Path(target, 'imagemnt')
 
-        with mount(loopdev, mount_path):
+        with mount(loopdev, mount_path, options=entry.options):
             _execute_fs_commands(entry.fs_path_commands, dict(path=mount_path))
             do([
                 'cp', '-a',

elbepack/imgutils.py

@@ -58,7 +58,7 @@ def __init__(self, device, target, *, bind=False, type=None, options=None, log_o
             cmd.append('--bind')
 
         if options is not None:
-            cmd.extend(['-o', ','.join(options)])
+            cmd.extend(['-o', options])
 
         if type is not None:
             cmd.extend(['-t', type])

newsfragments/+mount-options.bugfix.rst

@@ -0,0 +1 @@
+Always use custom mount options when mounting. These might be necessary for compression for example.