Add an optional [properties] in waydroid.cfg

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

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index 131944211395229fec16a94a4a266374ec85e9af..2a9c841d41d46201fcf09bbb45ca2f3be8ec1043 100644 (file)
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -231,7 +231,7 @@ def make_base_props(args):
         else:
             if os.path.isfile("/proc/device-tree/" + product):
                 with open("/proc/device-tree/" + product) as f:
-                    f_value = f.read().strip()
+                    f_value = f.read().strip().rstrip('\x00')
                     if f_value != "":
                         props.append("ro.product.waydroid." +
                                      product + "=" + f_value)
@@ -240,6 +240,14 @@ def make_base_props(args):
     if prop_fp != "":
         props.append("ro.build.fingerprint=" + prop_fp)
 
+    # now append/override with values in [properties] section of waydroid.cfg
+    cfg = tools.config.load(args)
+    for k, v in cfg["properties"].items():
+        for idx, elem in enumerate(props):
+            if (k+"=") in elem:
+                props.pop(idx)
+        props.append(k+"="+v)
+
     base_props = open(args.work + "/waydroid_base.prop", "w")
     for prop in props:
         base_props.write(prop + "\n")