X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/40c6aa7ac2bcf00f42efd43be4c0a06dec1ed0a6..c9ea5abff749e660c9aca0fcd224875464c3dacd:/tools/config/__init__.py diff --git a/tools/config/__init__.py b/tools/config/__init__.py index 1edbf17..e14ff2d 100644 --- a/tools/config/__init__.py +++ b/tools/config/__init__.py @@ -12,7 +12,7 @@ from tools.config.save import save # # Exported variables (internal configuration) # -version = "1.3.4" +version = "1.4.3" tools_src = os.path.normpath(os.path.realpath(__file__) + "/../../..") # Keys saved in the config file (mostly what we ask in 'waydroid init') @@ -21,7 +21,9 @@ config_keys = ["arch", "vendor_type", "system_datetime", "vendor_datetime", - "suspend_action"] + "suspend_action", + "mount_overlays", + "auto_adb"] # Config file/commandline default values # $WORK gets replaced with the actual value for args.work (which may be @@ -36,7 +38,11 @@ defaults = { "/etc/waydroid-extra/images", "/usr/share/waydroid-extra/images", ], - "suspend_action": "freeze" + "suspend_action": "freeze", + "mount_overlays": "True", + "auto_adb": "True", + "container_xdg_runtime_dir": "/run/xdg", + "container_wayland_display": "wayland-0", } defaults["images_path"] = defaults["work"] + "/images" defaults["rootfs"] = defaults["work"] + "/rootfs" @@ -46,6 +52,7 @@ defaults["overlay_work"] = defaults["work"] + "/overlay_work" defaults["data"] = defaults["work"] + "/data" defaults["lxc"] = defaults["work"] + "/lxc" defaults["host_perms"] = defaults["work"] + "/host-permissions" +defaults["container_pulse_runtime_path"] = defaults["container_xdg_runtime_dir"] + "/pulse" session_defaults = { "user_name": pwd.getpwuid(os.getuid()).pw_name, @@ -58,9 +65,9 @@ session_defaults = { "wayland_display": str(os.environ.get('WAYLAND_DISPLAY')), "pulse_runtime_path": str(os.environ.get('PULSE_RUNTIME_PATH')), "state": "STOPPED", - "lcd_density": "0" + "lcd_density": "0", + "background_start": "true" } -session_defaults["config_path"] = defaults["work"] + "/session.cfg" session_defaults["waydroid_data"] = session_defaults["xdg_data_home"] + \ "/waydroid/data" if session_defaults["pulse_runtime_path"] == "None":