X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/blobdiff_plain/244ee49a37ae4f19dcc16d1f89eb265bb2cfd6ef..79fada5c36517e2a12fc871567d54528f86a947a:/tools/helpers/lxc.py diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py index 531af80..5143b8a 100644 --- a/tools/helpers/lxc.py +++ b/tools/helpers/lxc.py @@ -38,6 +38,7 @@ def generate_nodes_lxc_config(args): # Necessary dev nodes make_entry("tmpfs", "dev", "tmpfs", "nosuid 0 0", False) make_entry("/dev/zero") + make_entry("/dev/null") make_entry("/dev/full") make_entry("/dev/ashmem", check=False) make_entry("/dev/fuse") @@ -106,6 +107,11 @@ def generate_nodes_lxc_config(args): make_entry("tmpfs", "var", "tmpfs", "nodev 0 0", False) make_entry("/var/run", options="rbind,create=dir,optional 0 0") + # tmp + make_entry("tmpfs", "tmp", "tmpfs", "nodev 0 0", False) + for n in glob.glob("/tmp/run-*"): + make_entry(n, options="rbind,create=dir,optional 0 0") + return nodes @@ -207,6 +213,10 @@ def make_base_props(args): props.append("waydroid.vendor_ota=" + args.vendor_ota) props.append("waydroid.tools_version=" + tools.config.version) + if args.vendor_type == "MAINLINE": + props.append("ro.vndk.lite=true") + props.append("ro.hardware.camera=v4l2") + base_props = open(args.work + "/waydroid_base.prop", "w") for prop in props: base_props.write(prop + "\n") @@ -239,7 +249,9 @@ def setup_host_perms(args): def status(args): command = ["lxc-info", "-P", tools.config.defaults["lxc"], "-n", "waydroid", "-sH"] - return subprocess.run(command, stdout=subprocess.PIPE).stdout.decode('utf-8').strip() + out = subprocess.run(command, stdout=subprocess.PIPE).stdout.decode('utf-8').strip() + os.chmod(args.log, 0o666) + return out def start(args): command = ["lxc-start", "-P", tools.config.defaults["lxc"],