diff options
| author | Kazutoshi Noguchi <noguchi.kazutosi+Az0Gjft4@gmail.com> | 2021-07-06 17:12:28 +0900 |
|---|---|---|
| committer | github-actions[bot] <github-actions[bot]@users.noreply.github.com> | 2021-08-03 11:24:05 +0000 |
| commit | 3d3ced33c948b85032364fd657e5a74126652b49 (patch) | |
| tree | 26b98921fea7e49ad8b5816981837c38d59b8ac1 | |
| parent | Merge pull request #132462 from NixOS/backport-132438-to-release-21.05 (diff) | |
| download | nixpkgs-3d3ced33c948b85032364fd657e5a74126652b49.tar.gz | |
nixos/binfmt: run binfmt activation script after mounting /runorigin/backport-129413-to-release-21.05
binfmt activation script creates /run/binfmt before mounting /run
when system activation.
To fix it I added dependency to specialfs to binfmt activation
script.
(cherry picked from commit bf227785854c9fd4a14c20db12dd6d3ebaf02981)
| -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)} ''; |