fix bashWrapper

nix-community · Sep 12, 2023 · 544d922 · 544d922
1 parent da34902
commit 544d922
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 11 deletions.
diff --git a/modules/systemd/default.nix b/modules/systemd/default.nix
@@ -20,8 +20,6 @@ with lib; {
     in
     mkIf (cfg.enable) {
 
-      wsl.binShPkg = if cfg.nativeSystemd then bashWrapper else pkgs.bashInteractive;
-
       # systemd-oomd requires cgroup pressure info which WSL doesn't have
       systemd.oomd.enable = false;
 

diff --git a/modules/systemd/native/default.nix b/modules/systemd/native/default.nix
@@ -5,11 +5,20 @@ with lib; {
     let
       cfg = config.wsl;
       nativeUtils = pkgs.callPackage ../../../utils { };
+
+      bashWrapper = pkgs.writeShellScriptBin "sh" ''
+        export PATH="$PATH:${lib.makeBinPath [ pkgs.systemd pkgs.gnugrep ]}"
+        exec ${pkgs.bashInteractive}/bin/sh "$@"
+      '';
     in
     mkIf (cfg.enable && cfg.nativeSystemd) {
-      wsl.wslConf = {
-        user.default = config.users.users.${cfg.defaultUser}.name;
-        boot.systemd = true;
+
+      wsl = {
+        binShPkg = bashWrapper;
+        wslConf = {
+          user.default = config.users.users.${cfg.defaultUser}.name;
+          boot.systemd = true;
+        };
       };
 
       system.activationScripts = {

diff --git a/modules/systemd/syschdemd/default.nix b/modules/systemd/syschdemd/default.nix
@@ -14,11 +14,15 @@ with lib; {
     in
     mkIf (cfg.enable && !cfg.nativeSystemd) {
 
+      wsl = {
+        binShPkg = pkgs.bashInteractive;
+        wslConf.user.default = "root";
+      };
+
       users.users.root.shell = "${syschdemd}/bin/syschdemd";
       security.sudo.extraConfig = ''
         Defaults env_keep+=INSIDE_NAMESPACE
       '';
-      wsl.wslConf.user.default = "root";
 
       # Start a systemd user session when starting a command through runuser
       security.pam.services.runuser.startSession = true;

diff --git a/modules/wsl-distro.nix b/modules/wsl-distro.nix
@@ -3,11 +3,6 @@
 with builtins; with lib;
 
 let
-  bashWrapper = pkgs.writeShellScriptBin "sh" ''
-    export PATH="$PATH:${lib.makeBinPath [ pkgs.systemd pkgs.gnugrep ]}"
-    exec ${pkgs.bashInteractive}/bin/sh "$@"
-  '';
-
   cfg = config.wsl;
 in
 {