From: Bart Ribbers <bribbers@disroot.org>
Date: Thu, 2 Sep 2021 19:56:48 +0000 (+0200)
Subject: config: Store data in /var/lib/waydroid rather than /home/.waydroid
X-Git-Tag: 1.1.0~27
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/eef036b3f814a9fc4869ebfe6c9d2bd51fa19f26?ds=sidebyside

config: Store data in /var/lib/waydroid rather than /home/.waydroid
---

diff --git a/data/configs/config_1 b/data/configs/config_1
index 02d82a7..97ef00e 100644
--- a/data/configs/config_1
+++ b/data/configs/config_1
@@ -1,6 +1,6 @@
 # Waydroid LXC Config
 
-lxc.rootfs.path = /home/.waydroid/rootfs
+lxc.rootfs.path = /var/lib/waydroid/rootfs
 lxc.utsname = waydroid
 lxc.arch = LXCARCH
 lxc.autodev = 0
@@ -20,6 +20,6 @@ lxc.network.mtu = 1500
 
 lxc.console.path = none
 
-lxc.include = /home/.waydroid/lxc/waydroid/config_nodes
+lxc.include = /var/lib/waydroid/lxc/waydroid/config_nodes
 
 lxc.hook.post-stop = /dev/null
diff --git a/data/configs/config_2 b/data/configs/config_2
index dd2af68..b397c02 100644
--- a/data/configs/config_2
+++ b/data/configs/config_2
@@ -1,6 +1,6 @@
 # Waydroid LXC Config
 
-lxc.rootfs.path = /home/.waydroid/rootfs
+lxc.rootfs.path = /var/lib/waydroid/rootfs
 lxc.uts.name = waydroid
 lxc.arch = LXCARCH
 lxc.autodev = 0
@@ -20,6 +20,6 @@ lxc.net.0.mtu = 1500
 
 lxc.console.path = none
 
-lxc.include = /home/.waydroid/lxc/waydroid/config_nodes
+lxc.include = /var/lib/waydroid/lxc/waydroid/config_nodes
 
 lxc.hook.post-stop = /dev/null
diff --git a/tools/config/__init__.py b/tools/config/__init__.py
index 9af1657..f1bde16 100644
--- a/tools/config/__init__.py
+++ b/tools/config/__init__.py
@@ -38,7 +38,7 @@ session_config_keys = ["user_name",
 # overridden on the commandline)
 defaults = {
     "arch": "arm64",
-    "work": "/home/.waydroid",
+    "work": "/var/lib/waydroid",
     "vendor_type": "MAINLINE",
     "system_datetime": "0",
     "vendor_datetime": "0",
diff --git a/tools/helpers/arguments.py b/tools/helpers/arguments.py
index ec4ef7c..efb520f 100644
--- a/tools/helpers/arguments.py
+++ b/tools/helpers/arguments.py
@@ -22,7 +22,7 @@ def arguments_init(subparser):
                                " configs and install images")
     ret.add_argument("-i", "--images_path",
                         help="custom path to waydroid images (default in"
-                             " /home/.waydroid/images)")
+                             " /var/lib/waydroid/images)")
     ret.add_argument("-f", "--force", action="store_true",
                      help="re-initialize configs and images")
     ret.add_argument("-c", "--system_channel",