Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support envfs #525

Merged
merged 2 commits into from
Oct 13, 2024
Merged

Support envfs #525

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
59fa6ee
Support envfs
Atry Aug 2, 2024
3f455a5
Use mkIf to disable populateBin
Atry Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion modules/wsl-distro.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,14 +207,25 @@ in

# require people to use lib.mkForce to make it harder to brick their installation
wsl = {
populateBin = true;
populateBin = mkIf config.services.envfs.enable false;
extraBin = [
{ src = "/init"; name = "wslpath"; }
{ src = "${cfg.binShPkg}/bin/sh"; name = "sh"; }
{ src = "${pkgs.util-linux}/bin/mount"; }
];
};

services.envfs.extraFallbackPathCommands =
concatStringsSep "\n"
(map
(entry:
if entry.copy
then "cp -f ${entry.src} $out/${entry.name}"
else "ln -sf ${entry.src} $out/${entry.name}"
)
cfg.extraBin
);

warnings = flatten [
(optional (config.services.resolved.enable && config.wsl.wslConf.network.generateResolvConf)
"systemd-resolved is enabled, but resolv.conf is managed by WSL (wsl.wslConf.network.generateResolvConf)"
Expand Down
Loading