X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/cca8af2d7d3494d887d9655f8e78244b5a2ca513..094a4d970ccefa2e6409c8147c1edbdaaa74df0f:/tools/config/__init__.py diff --git a/tools/config/__init__.py b/tools/config/__init__.py index 830dbb7..0ed3d46 100644 --- a/tools/config/__init__.py +++ b/tools/config/__init__.py @@ -6,13 +6,13 @@ import pwd # # Exported functions # -from tools.config.load import load, load_session, load_channels -from tools.config.save import save, save_session +from tools.config.load import load, load_channels +from tools.config.save import save # # Exported variables (internal configuration) # -version = "1.3.3" +version = "1.3.4" tools_src = os.path.normpath(os.path.realpath(__file__) + "/../../..") # Keys saved in the config file (mostly what we ask in 'waydroid init') @@ -23,18 +23,6 @@ config_keys = ["arch", "vendor_datetime", "suspend_action"] -session_config_keys = ["user_name", - "user_id", - "group_id", - "host_user", - "xdg_data_home", - "waydroid_data", - "xdg_runtime_dir", - "wayland_display", - "pulse_runtime_path", - "state", - "lcd_density"] - # Config file/commandline default values # $WORK gets replaced with the actual value for args.work (which may be # overridden on the commandline) @@ -61,6 +49,7 @@ session_defaults = { "user_id": str(os.getuid()), "group_id": str(os.getgid()), "host_user": os.path.expanduser("~"), + "pid": str(os.getpid()), "xdg_data_home": str(os.environ.get('XDG_DATA_HOME', os.path.expanduser("~") + "/.local/share")), "xdg_runtime_dir": str(os.environ.get('XDG_RUNTIME_DIR')), "wayland_display": str(os.environ.get('WAYLAND_DISPLAY')),