teleport: fix exec srv command not found (#165588)

This commit is contained in:
5aaee9 2022-03-28 11:27:12 +00:00 committed by GitHub
parent cb76c8bee3
commit 8aa41aeaea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 29 additions and 0 deletions

View File

@ -0,0 +1,28 @@
From e3651ca79c0edb66c04e0d3381f3b0b6f76d37d2 Mon Sep 17 00:00:00 2001
From: 5aaee9 <jiduye@gmail.com>
Date: Thu, 24 Mar 2022 17:34:38 +0800
Subject: [PATCH] fix: add nix path to exec env
---
lib/srv/exec.go | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/srv/exec.go b/lib/srv/exec.go
index 253fbafef..815a2e1e0 100644
--- a/lib/srv/exec.go
+++ b/lib/srv/exec.go
@@ -41,9 +41,9 @@ import (
)
const (
- defaultPath = "/bin:/usr/bin:/usr/local/bin:/sbin"
+ defaultPath = "/bin:/usr/bin:/usr/local/bin:/sbin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/run/wrappers/bin"
defaultEnvPath = "PATH=" + defaultPath
- defaultRootPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
+ defaultRootPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/etc/profiles/per-user/root/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/run/wrappers/bin"
defaultEnvRootPath = "PATH=" + defaultRootPath
defaultTerm = "xterm"
defaultLoginDefsPath = "/etc/login.defs"
--
2.32.0 (Apple Git-132)

View File

@ -60,6 +60,7 @@ buildGoModule rec {
./tsh.patch
# https://github.com/NixOS/nixpkgs/issues/132652
./test.patch
./0001-fix-add-nix-path-to-exec-env.patch
];
# Reduce closure size for client machines