diff options
author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2024-03-25 12:36:03 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-03-25 12:36:03 +0100 |
commit | 2724e182286d25d69c7709c2c41aa80ce8eb8e97 (patch) | |
tree | 380cc24afa79314eb1e9d48f0c5d645e12044a41 /nixos | |
parent | 283fa362e649f17c256b24ac2d49e5e2092a46be (diff) | |
parent | 3a8e8369a67cb68e0e267413c36d997e9e3f670c (diff) |
Merge pull request #297142 from Mic92/envfs
envfs: 1.0.3 -> 1.0.6
Diffstat (limited to 'nixos')
-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"; |