fix systemd user sessions by launching through runuser

nix-community · Oct 30, 2022 · 8cfef03 · 8cfef03
1 parent 136cc14
commit 8cfef03
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/modules/wsl-distro.nix b/modules/wsl-distro.nix
@@ -145,6 +145,9 @@ with builtins; with lib;
           enableEmergencyMode = false;
         };
 
+        # Start a systemd user session when starting a command through runuser
+        security.pam.services.runuser.startSession = true;
+
         warnings = (optional (config.systemd.services.systemd-resolved.enable && config.wsl.wslConf.network.generateResolvConf) "systemd-resolved is enabled, but resolv.conf is managed by WSL");
       })
       (mkIf (!cfg.nativeSystemd) {

diff --git a/scripts/syschdemd.nix b/scripts/syschdemd.nix
@@ -44,10 +44,9 @@ mkWrappedScript {
     glibc # getent
     gnugrep
     systemd # machinectl
-    util-linux # nsenter
+    util-linux # nsenter, runuser
     wrapper
   ];
   username = defaultUser.name;
-  uid = defaultUser.uid;
   inherit automountPath;
 }
diff --git a/scripts/syschdemd.sh b/scripts/syschdemd.sh
@@ -126,7 +126,6 @@ main() {
   run_in_namespace \
     systemd-run \
     --quiet \
-    --uid=@uid@ \
     --collect \
     --wait \
     --pty \
@@ -135,7 +134,7 @@ main() {
     --setenv=WSLPATH="$(clean_wslpath)" \
     --working-directory="$PWD" \
     --machine=.host \
-    /bin/sh -c "$exportCmd; source /etc/set-environment; exec $command"
+    "$(which runuser)" -u @username@ -- /bin/sh -c "$exportCmd; source /etc/set-environment; exec $command"
 }
 
 main "$@"