From: Alessandro Astone <ales.astone@gmail.com>
Date: Mon, 2 Oct 2023 18:35:48 +0000 (+0200)
Subject: lxc: Recursively mount vendor_extra
X-Git-Tag: 1.4.2~7
X-Git-Url: https://glassweightruler.freedombox.rocks/gitweb/waydroid.git/commitdiff_plain/f8dd47e11d823b549fc815fbceaa1e5260208983

lxc: Recursively mount vendor_extra

HALIUM devices may use bind-mounts to override libraries over the
prebuild read-only vendor image. We want to keep those overrides
in our /vendor_extra mount.
---

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index 76cfd74..6be7b7d 100644
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -74,7 +74,7 @@ def generate_nodes_lxc_config(args):
     if args.vendor_type != "MAINLINE":
         if not make_entry("/dev/hwbinder", "dev/host_hwbinder"):
             raise OSError('Binder node "hwbinder" of host not found')
-        make_entry("/vendor", "vendor_extra", options="bind,optional 0 0")
+        make_entry("/vendor", "vendor_extra", options="rbind,optional 0 0")
 
     # Necessary device nodes for adb
     make_entry("none", "dev/pts", "devpts", "defaults,mode=644,ptmxmode=666,create=dir 0 0", False)