diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-08-03 17:35:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-03 17:35:01 +0100 |
| commit | 51cfc3c6dbd3116c109c0f251a07c52638f253cc (patch) | |
| tree | 0fa37ebd1a16dd4d483942a9541c836e04c9eac2 | |
| parent | Merge pull request #132482 from Infinisil/vbox-size-backport (diff) | |
| parent | nixos/binfmt: run binfmt activation script after mounting /run (diff) | |
| download | nixpkgs-51cfc3c6dbd3116c109c0f251a07c52638f253cc.tar.gz | |
Merge pull request #132536 from NixOS/backport-129413-to-release-21.05
[Backport release-21.05] nixos/binfmt: run binfmt activation script after mounting /run
| -rw-r--r-- | nixos/modules/system/boot/binfmt.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nixos/modules/system/boot/binfmt.nix b/nixos/modules/system/boot/binfmt.nix index cbdf581d73a7..2408ecc80d22 100644 --- a/nixos/modules/system/boot/binfmt.nix +++ b/nixos/modules/system/boot/binfmt.nix @@ -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)} ''; |