From 1f0226f7e01822a2a5b37d8626b59b7b6f4d0144 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Tue, 7 Oct 2025 23:56:19 +0900 Subject: container/check: relocate overlay escape This is used in hst to format strings. Signed-off-by: Ophestra --- container/initoverlay.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'container/initoverlay.go') diff --git a/container/initoverlay.go b/container/initoverlay.go index 74ae7d00..5692af4e 100644 --- a/container/initoverlay.go +++ b/container/initoverlay.go @@ -139,7 +139,7 @@ func (o *MountOverlayOp) early(_ *setupState, k syscallDispatcher) error { if v, err := k.evalSymlinks(o.Upper.String()); err != nil { return err } else { - o.upper = EscapeOverlayDataSegment(toHost(v)) + o.upper = check.EscapeOverlayDataSegment(toHost(v)) } } @@ -147,7 +147,7 @@ func (o *MountOverlayOp) early(_ *setupState, k syscallDispatcher) error { if v, err := k.evalSymlinks(o.Work.String()); err != nil { return err } else { - o.work = EscapeOverlayDataSegment(toHost(v)) + o.work = check.EscapeOverlayDataSegment(toHost(v)) } } } @@ -157,7 +157,7 @@ func (o *MountOverlayOp) early(_ *setupState, k syscallDispatcher) error { if v, err := k.evalSymlinks(a.String()); err != nil { return err } else { - o.lower[i] = EscapeOverlayDataSegment(toHost(v)) + o.lower[i] = check.EscapeOverlayDataSegment(toHost(v)) } } return nil @@ -199,10 +199,10 @@ func (o *MountOverlayOp) apply(state *setupState, k syscallDispatcher) error { OptionOverlayWorkdir+"="+o.work) } options = append(options, - OptionOverlayLowerdir+"="+strings.Join(o.lower, SpecialOverlayPath), + OptionOverlayLowerdir+"="+strings.Join(o.lower, check.SpecialOverlayPath), OptionOverlayUserxattr) - return k.mount(SourceOverlay, target, FstypeOverlay, 0, strings.Join(options, SpecialOverlayOption)) + return k.mount(SourceOverlay, target, FstypeOverlay, 0, strings.Join(options, check.SpecialOverlayOption)) } func (o *MountOverlayOp) Is(op Op) bool { -- cgit v1.3.1