.desktop files should not be executable (#815)

[waydroid.git] / tools / helpers / mount.py

diff --git a/tools/helpers/mount.py b/tools/helpers/mount.py
index a0d34be5d8a8d6e1f0614ac88ae45bd7a39762d8..236ff5b4c94af98d117160bb614410e9a6d1d67b 100644 (file)
--- a/tools/helpers/mount.py
+++ b/tools/helpers/mount.py
@@ -2,6 +2,7 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 import os
 import tools.helpers.run
+from tools.helpers.version import versiontuple, kernel_version
 
 
 def ismount(folder):
@@ -156,7 +157,7 @@ def mount_overlay(args, lower_dirs, destination, upper_dir=None, work_dir=None,
     Mount an overlay.
     """
     dirs = [*lower_dirs]
-    options = ["xino=off", "lowerdir=" + (":".join(lower_dirs))]
+    options = ["lowerdir=" + (":".join(lower_dirs))]
 
     if upper_dir:
         dirs.append(upper_dir)
@@ -164,6 +165,9 @@ def mount_overlay(args, lower_dirs, destination, upper_dir=None, work_dir=None,
         options.append("upperdir=" + upper_dir)
         options.append("workdir=" + work_dir)
 
+    if kernel_version() >= versiontuple("4.17"):
+        options.append("xino=off")
+
     for dir_path in dirs:
         if not os.path.exists(dir_path):
             if create_folders: