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

nixos/binfmt: run binfmt activation script after mounting /run

authored by

Jörg Thalheim and committed by
GitHub
f0672fa7 c0f55f9f

+2 -2
+2 -2
nixos/modules/system/boot/binfmt.nix
··· 1 { config, lib, pkgs, ... }: 2 let 3 - inherit (lib) mkOption types optionalString; 4 5 cfg = config.boot.binfmt; 6 ··· 270 271 environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" 272 (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); 273 - system.activationScripts.binfmt = '' 274 mkdir -p -m 0755 /run/binfmt 275 ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} 276 '';
··· 1 { config, lib, pkgs, ... }: 2 let 3 + inherit (lib) mkOption types optionalString stringAfter; 4 5 cfg = config.boot.binfmt; 6 ··· 270 271 environment.etc."binfmt.d/nixos.conf".source = builtins.toFile "binfmt_nixos.conf" 272 (lib.concatStringsSep "\n" (lib.mapAttrsToList makeBinfmtLine config.boot.binfmt.registrations)); 273 + system.activationScripts.binfmt = stringAfter [ "specialfs" ] '' 274 mkdir -p -m 0755 /run/binfmt 275 ${lib.concatStringsSep "\n" (lib.mapAttrsToList activationSnippet config.boot.binfmt.registrations)} 276 '';