proc: remove duplicate compile-time fortify reference
All checks were successful
Build / Create distribution (push) Successful in 1m46s
Test / Run NixOS test (push) Successful in 3m44s

This is no longer needed since shim and init are now part of the main program.

Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
2025-01-18 11:59:33 +09:00
parent 27d2914286
commit 7baca66a56
7 changed files with 36 additions and 15 deletions

View File

@@ -37,14 +37,6 @@ func Main() {
}
}
// check path to fortify
var fortifyPath string
if p, ok := internal.Path(internal.Fortify); !ok {
fmsg.Fatal("invalid fortify path, this copy of fortify is not compiled correctly")
} else {
fortifyPath = p
}
// receive setup payload
var (
payload Payload
@@ -135,7 +127,7 @@ func Main() {
// bind fortify inside sandbox
innerSbin := path.Join(fst.Tmp, "sbin")
fortifyInnerPath := path.Join(innerSbin, "fortify")
conf.Bind(fortifyPath, fortifyInnerPath)
conf.Bind(proc.MustExecutable(), fortifyInnerPath)
conf.Symlink(fortifyInnerPath, path.Join(innerSbin, "init"))
helper.BubblewrapName = payload.Exec[0] // resolved bwrap path by parent

View File

@@ -56,7 +56,7 @@ func (s *Shim) WaitFallback() chan error {
func (s *Shim) Start() (*time.Time, error) {
// prepare user switcher invocation
var fsu string
if p, ok := internal.Check(internal.Fsu); !ok {
if p, ok := internal.Path(internal.Fsu); !ok {
fmsg.Fatal("invalid fsu path, this copy of fortify is not compiled correctly")
panic("unreachable")
} else {