diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-03-31 19:31:37 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-03-31 21:27:31 +0900 |
| commit | 4036da3b5c28d1a37780acc179985067865b94d0 (patch) | |
| tree | 48479ba67dfe12e06d396fefaaac6d3af27b6c7c /cmd | |
| parent | 986105958cdf2071d07b2e1fd2321884e4f09ccc (diff) | |
fst: optional configured shell path
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/fpkg/app.go | 1 | ||||
| -rw-r--r-- | cmd/fpkg/with.go | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cmd/fpkg/app.go b/cmd/fpkg/app.go index cf92dad1..e67ef112 100644 --- a/cmd/fpkg/app.go +++ b/cmd/fpkg/app.go @@ -73,6 +73,7 @@ func (app *appInfo) toFst(pathSet *appPathSet, argv []string, flagDropShell bool Username: "fortify", Inner: path.Join("/data/data", app.ID), Outer: pathSet.homeDir, + Shell: shellPath, Sandbox: &fst.SandboxConfig{ Hostname: formatHostname(app.Name), Devel: app.Devel, diff --git a/cmd/fpkg/with.go b/cmd/fpkg/with.go index d321de3f..f9ffe848 100644 --- a/cmd/fpkg/with.go +++ b/cmd/fpkg/with.go @@ -34,6 +34,7 @@ func withNixDaemon( Username: "fortify", Inner: path.Join("/data/data", app.ID), Outer: pathSet.homeDir, + Shell: shellPath, Sandbox: &fst.SandboxConfig{ Hostname: formatHostname(app.Name) + "-" + action, Userns: true, // nix sandbox requires userns @@ -72,6 +73,7 @@ func withCacheDir( Username: "nixos", Inner: path.Join("/data/data", app.ID, "cache"), Outer: pathSet.cacheDir, // this also ensures cacheDir via shim + Shell: shellPath, Sandbox: &fst.SandboxConfig{ Hostname: formatHostname(app.Name) + "-" + action, Seccomp: seccomp.FlagMultiarch, |