Merge pull request #129413 from ngkz/binfmt-order-fix

nixos/binfmt: run binfmt activation script after mounting /run
This commit is contained in:
Jörg Thalheim 2021-08-03 12:20:17 +01:00 committed by GitHub
commit f0672fa7fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,6 @@
{ config, lib, pkgs, ... }:
let
inherit (lib) mkOption types optionalString;
inherit (lib) mkOption types optionalString stringAfter;
cfg = config.boot.binfmt;
@ -270,7 +270,7 @@ in {
environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf"
(lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations));
system.activationScripts.binfmt = ''
system.activationScripts.binfmt = stringAfter [ "specialfs" ] ''
mkdir -p -m 0755 /run/binfmt
${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)}
'';