Fix prop set command

[waydroid.git] / tools / config / __init__.py

diff --git a/tools/config/__init__.py b/tools/config/__init__.py
index 97bba865658cf165981d944fb766f5233f2f1710..0ed3d46ffa00af9a119c1f89a43f6ef28c67b579 100644 (file)
--- a/tools/config/__init__.py
+++ b/tools/config/__init__.py
@@ -6,13 +6,13 @@ import pwd
 #
 # Exported functions
 #
 #
 # 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)
 #
 
 #
 # Exported variables (internal configuration)
 #

-version = "1.2.1"
+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')
 tools_src = os.path.normpath(os.path.realpath(__file__) + "/../../..")
 
 # Keys saved in the config file (mostly what we ask in 'waydroid init')


@@ -20,19 +20,8 @@ config_keys = ["arch",
                "images_path",
                "vendor_type",
                "system_datetime",
                "images_path",
                "vendor_type",
                "system_datetime",

-               "vendor_datetime"]
-
-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"]
+               "vendor_datetime",
+               "suspend_action"]

 
 # Config file/commandline default values
 # $WORK gets replaced with the actual value for args.work (which may be
 
 # Config file/commandline default values
 # $WORK gets replaced with the actual value for args.work (which may be


@@ -43,7 +32,11 @@ defaults = {
     "vendor_type": "MAINLINE",
     "system_datetime": "0",
     "vendor_datetime": "0",
     "vendor_type": "MAINLINE",
     "system_datetime": "0",
     "vendor_datetime": "0",

-    "preinstalled_images_path": "/usr/share/waydroid-extra/images"
+    "preinstalled_images_paths": [
+        "/etc/waydroid-extra/images",
+        "/usr/share/waydroid-extra/images",
+    ],
+    "suspend_action": "freeze"

 }
 defaults["images_path"] = defaults["work"] + "/images"
 defaults["rootfs"] = defaults["work"] + "/rootfs"
 }
 defaults["images_path"] = defaults["work"] + "/images"
 defaults["rootfs"] = defaults["work"] + "/rootfs"


@@ -56,6 +49,7 @@ session_defaults = {
     "user_id": str(os.getuid()),
     "group_id": str(os.getgid()),
     "host_user": os.path.expanduser("~"),
     "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')),
     "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')),