diff options
| author | Jörg Thalheim <joerg@thalheim.io> | 2024-03-19 11:06:21 +0100 |
|---|---|---|
| committer | Jörg Thalheim <joerg@thalheim.io> | 2024-04-10 17:01:12 +0200 |
| commit | 9cc03c599e625d47469a02f997801cbd4a6fc94a (patch) | |
| tree | 608ef22affa53c2baacd3407af9d582ed87f0925 /nixos/modules | |
| parent | 73844014f48f8f968f98366b33bbdcf693d6d407 (diff) | |
envfs: 1.0.3 -> 1.0.6
Diff: https://github.com/Mic92/envfs/compare/1.0.3...1.0.6 (cherry picked from commit 3a8e8369a67cb68e0e267413c36d997e9e3f670c)
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/tasks/filesystems/envfs.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/nixos/modules/tasks/filesystems/envfs.nix b/nixos/modules/tasks/filesystems/envfs.nix index 365cb46ff2fe3..6719a03610d10 100644 --- a/nixos/modules/tasks/filesystems/envfs.nix +++ b/nixos/modules/tasks/filesystems/envfs.nix @@ -7,6 +7,7 @@ let device = "none"; fsType = "envfs"; options = [ + "bind-mount=/bin" "fallback-path=${pkgs.runCommand "fallback-path" {} ('' mkdir -p $out ln -s ${config.environment.usrbinenv} $out/env @@ -15,6 +16,9 @@ let "nofail" ]; }; + # We need to bind-mount /bin to /usr/bin, because otherwise upgrading + # from envfs < 1.0.5 will cause having the old envs with no /bin bind mount. + # Systemd is smart enough to not mount /bin if it's already mounted. "/bin" = { device = "/usr/bin"; fsType = "none"; |