hst/fs: access ops through interface
All checks were successful
Test / Create distribution (push) Successful in 35s
Test / Hakurei (push) Successful in 3m14s
Test / Hpkg (push) Successful in 4m1s
Test / Sandbox (race detector) (push) Successful in 4m28s
Test / Hakurei (race detector) (push) Successful in 5m22s
Test / Sandbox (push) Successful in 1m28s
Test / Flake checks (push) Successful in 1m29s
All checks were successful
Test / Create distribution (push) Successful in 35s
Test / Hakurei (push) Successful in 3m14s
Test / Hpkg (push) Successful in 4m1s
Test / Sandbox (race detector) (push) Successful in 4m28s
Test / Hakurei (race detector) (push) Successful in 5m22s
Test / Sandbox (push) Successful in 1m28s
Test / Flake checks (push) Successful in 1m29s
This removes the final hakurei.app/container import from hst. Signed-off-by: Ophestra <cat@gensokyo.uk>
This commit is contained in:
@@ -3,6 +3,7 @@ package app
|
||||
import (
|
||||
"errors"
|
||||
"io/fs"
|
||||
"os"
|
||||
"path"
|
||||
"strconv"
|
||||
"syscall"
|
||||
@@ -88,7 +89,7 @@ func (s *spParamsOp) toContainer(state *outcomeStateParams) error {
|
||||
state.as.AutoEtcPrefix = state.id.String()
|
||||
ops := make(container.Ops, 0, preallocateOpsCount+len(state.Container.Filesystem))
|
||||
state.params.Ops = &ops
|
||||
state.as.Ops = &ops
|
||||
state.as.Ops = opsAdapter{&ops}
|
||||
}
|
||||
|
||||
rootfs, filesystem, _ := resolveRoot(state.Container)
|
||||
@@ -304,3 +305,38 @@ func evalSymlinks(msg container.Msg, k syscallDispatcher, v *string) error {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
// opsAdapter implements [hst.Ops] on [container.Ops].
|
||||
type opsAdapter struct{ *container.Ops }
|
||||
|
||||
func (p opsAdapter) Tmpfs(target *check.Absolute, size int, perm os.FileMode) hst.Ops {
|
||||
return opsAdapter{p.Ops.Tmpfs(target, size, perm)}
|
||||
}
|
||||
|
||||
func (p opsAdapter) Readonly(target *check.Absolute, perm os.FileMode) hst.Ops {
|
||||
return opsAdapter{p.Ops.Readonly(target, perm)}
|
||||
}
|
||||
|
||||
func (p opsAdapter) Bind(source, target *check.Absolute, flags int) hst.Ops {
|
||||
return opsAdapter{p.Ops.Bind(source, target, flags)}
|
||||
}
|
||||
|
||||
func (p opsAdapter) Overlay(target, state, work *check.Absolute, layers ...*check.Absolute) hst.Ops {
|
||||
return opsAdapter{p.Ops.Overlay(target, state, work, layers...)}
|
||||
}
|
||||
|
||||
func (p opsAdapter) OverlayReadonly(target *check.Absolute, layers ...*check.Absolute) hst.Ops {
|
||||
return opsAdapter{p.Ops.OverlayReadonly(target, layers...)}
|
||||
}
|
||||
|
||||
func (p opsAdapter) Link(target *check.Absolute, linkName string, dereference bool) hst.Ops {
|
||||
return opsAdapter{p.Ops.Link(target, linkName, dereference)}
|
||||
}
|
||||
|
||||
func (p opsAdapter) Root(host *check.Absolute, flags int) hst.Ops {
|
||||
return opsAdapter{p.Ops.Root(host, flags)}
|
||||
}
|
||||
|
||||
func (p opsAdapter) Etc(host *check.Absolute, prefix string) hst.Ops {
|
||||
return opsAdapter{p.Ops.Etc(host, prefix)}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user