diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-08-03 12:20:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-08-03 12:20:17 +0100 |
commit | f0672fa7fb193143318f3b03b2f2f53523df35cb (patch) | |
tree | fc077589f7d7006980a5f079507e2945c38fa1e9 /nixos | |
parent | c0f55f9f0de37e39e3258402463c2023a77d144b (diff) | |
parent | bf227785854c9fd4a14c20db12dd6d3ebaf02981 (diff) |
Merge pull request #129413 from ngkz/binfmt-order-fix
nixos/binfmt: run binfmt activation script after mounting /run
Diffstat (limited to 'nixos')
-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 cbdf581d73a7f..2408ecc80d22b 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)} ''; |