about summary refs log tree commit diff
path: root/nixos/modules/virtualisation
diff options
context:
space:
mode:
authorMihai-Drosi Câju <cajum.bugs@yandex.com>2023-09-24 17:46:51 +0300
committerMihai-Drosi Câju <bug@me.not>2023-12-24 16:04:20 +0200
commit800af4240b3ef56509dec2ca6cc55f578701bed4 (patch)
tree772897d924358b553bebda91f885550a70493f60 /nixos/modules/virtualisation
parentb141712299da1e5b5a91b5d738e8cd36f2a9edcf (diff)
downloadnixlib-800af4240b3ef56509dec2ca6cc55f578701bed4.tar
nixlib-800af4240b3ef56509dec2ca6cc55f578701bed4.tar.gz
nixlib-800af4240b3ef56509dec2ca6cc55f578701bed4.tar.bz2
nixlib-800af4240b3ef56509dec2ca6cc55f578701bed4.tar.lz
nixlib-800af4240b3ef56509dec2ca6cc55f578701bed4.tar.xz
nixlib-800af4240b3ef56509dec2ca6cc55f578701bed4.tar.zst
nixlib-800af4240b3ef56509dec2ca6cc55f578701bed4.zip
nixos/waydroid: Replace requirement for ASHMEM with MEMFD_CREATE
* fixes #250302
* ASHMEM was removed in Linux 5.18 and waydroid can use MEMFD instead.
  MEMFD is enabled by default in 4.18 and later kernels while we
  already require this version for namespace support.
Diffstat (limited to 'nixos/modules/virtualisation')
-rw-r--r--nixos/modules/virtualisation/waydroid.nix2
1 files changed, 1 insertions, 1 deletions
diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix
index b0e85b685083..1f466c780cf2 100644
--- a/nixos/modules/virtualisation/waydroid.nix
+++ b/nixos/modules/virtualisation/waydroid.nix
@@ -32,7 +32,7 @@ in
     system.requiredKernelConfig = [
       (kCfg.isEnabled "ANDROID_BINDER_IPC")
       (kCfg.isEnabled "ANDROID_BINDERFS")
-      (kCfg.isEnabled "ASHMEM") # FIXME Needs memfd support instead on Linux 5.18 and waydroid 1.2.1
+      (kCfg.isEnabled "MEMFD_CREATE")
     ];
 
     /* NOTE: we always enable this flag even if CONFIG_PSI_DEFAULT_DISABLED is not on