lxc: Only add /dev/ashmem to config_nodes when it exists

This hasn't existed in mainline Linux kernels since v5.18 and trying to
always mount it regardless just adds to the noise in "waydroid log" in
most cases, so simply don't add it to config_nodes unless it actually
exists.

Silences the following:

  lxc-start: waydroid: ../src/lxc/utils.c: safe_mount: 1221 No such file or directory - Failed to mount "/dev/ashmem" onto "/usr/lib/lxc/rootfs/dev/ashmem"

diff --git a/tools/actions/initializer.py b/tools/actions/initializer.py
index fdc4a40a3c6a3a6d58f654114158722e3a6086fb..d886fa1fb48cdad6db892c567961395e0677a757 100644 (file)
--- a/tools/actions/initializer.py
+++ b/tools/actions/initializer.py
@@ -128,6 +128,7 @@ def init(args):
             os.mkdir(tools.config.defaults["overlay_rw"])
             os.mkdir(tools.config.defaults["overlay_rw"]+"/system")
             os.mkdir(tools.config.defaults["overlay_rw"]+"/vendor")
             os.mkdir(tools.config.defaults["overlay_rw"])
             os.mkdir(tools.config.defaults["overlay_rw"]+"/system")
             os.mkdir(tools.config.defaults["overlay_rw"]+"/vendor")

+        helpers.drivers.probeAshmemDriver(args)

         helpers.lxc.setup_host_perms(args)
         helpers.lxc.set_lxc_config(args)
         helpers.lxc.make_base_props(args)
         helpers.lxc.setup_host_perms(args)
         helpers.lxc.set_lxc_config(args)
         helpers.lxc.make_base_props(args)

diff --git a/tools/actions/upgrader.py b/tools/actions/upgrader.py
index 605de441e040546c3b705feab1e148326a97bf9a..3a0dcba5e7704c5cf11c368ae8a1610e81c489d7 100644 (file)
--- a/tools/actions/upgrader.py
+++ b/tools/actions/upgrader.py
@@ -48,6 +48,7 @@ def upgrade(args):
             helpers.images.get(args)
         else:
             logging.info("Upgrade refused because a pre-installed image is detected at {}.".format(args.images_path))
             helpers.images.get(args)
         else:
             logging.info("Upgrade refused because a pre-installed image is detected at {}.".format(args.images_path))

+    helpers.drivers.probeAshmemDriver(args)

     helpers.lxc.setup_host_perms(args)
     helpers.lxc.set_lxc_config(args)
     helpers.lxc.make_base_props(args)
     helpers.lxc.setup_host_perms(args)
     helpers.lxc.set_lxc_config(args)
     helpers.lxc.make_base_props(args)

diff --git a/tools/helpers/lxc.py b/tools/helpers/lxc.py
index b7bbf6612492c16b3662c44366f0c400e734696b..ae54128c71da42be046288585ef8359e2a10a102 100644 (file)
--- a/tools/helpers/lxc.py
+++ b/tools/helpers/lxc.py
@@ -42,7 +42,7 @@ def generate_nodes_lxc_config(args):
     make_entry("/dev/zero")
     make_entry("/dev/null")
     make_entry("/dev/full")
     make_entry("/dev/zero")
     make_entry("/dev/null")
     make_entry("/dev/full")

-    make_entry("/dev/ashmem", check=False)
+    make_entry("/dev/ashmem")

     make_entry("/dev/fuse")
     make_entry("/dev/ion")
     make_entry("/dev/char", options="bind,create=dir,optional 0 0")
     make_entry("/dev/fuse")
     make_entry("/dev/ion")
     make_entry("/dev/char", options="bind,create=dir,optional 0 0")