From: Shengjing Zhu <i@zhsj.me>
Date: Wed, 22 Jan 2020 04:11:29 +0000 (+0800)
Subject: Fix mount squashfs on kernel 5.4
X-Git-Tag: v6~93^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F399%2Fhead;p=thirdparty%2Fmkosi.git

Fix mount squashfs on kernel 5.4

kernel 5.4 failed to mount squashfs

[764311.251432] squashfs: Unknown parameter 'discard'
---

diff --git a/mkosi b/mkosi
index f0d51204f..7ce62befe 100755
--- a/mkosi
+++ b/mkosi
@@ -941,18 +941,22 @@ def prepare_srv(args: CommandLineArguments, dev: Optional[str], cached: bool) ->
 def mount_loop(args: CommandLineArguments, dev: str, where: str, read_only: bool = False) -> None:
     os.makedirs(where, 0o755, True)
 
-    options = "-odiscard"
+    options = []
+    if not args.output_format.is_squashfs():
+        options.append("discard")
 
     if args.compress and args.output_format == OutputFormat.gpt_btrfs:
         if isinstance(args.compress, bool):
-            options += ",compress"
+            options.append("compress")
         else:
-            options += f",compress={args.compress}"
+            options.append(f",compress={args.compress}")
 
     if read_only:
-        options += ",ro"
+        options.append("ro")
+
+    options_arg = "-o" + ",".join(options) if options else ""
 
-    run(["mount", "-n", dev, where, options], check=True)
+    run(["mount", "-n", dev, where, options_arg], check=True)
 
 
 def mount_bind(what: str, where: str) -> None: