diff options
| author | Ophestra <cat@gensokyo.uk> | 2025-08-20 17:33:15 +0900 |
|---|---|---|
| committer | Ophestra <cat@gensokyo.uk> | 2025-08-20 17:33:15 +0900 |
| commit | 696e5938989dc5652dbf56686c289dd6994c9d4c (patch) | |
| tree | 5d619b7fd228b44ff154472c63a93b29069ff1b0 /container/initoverlay.go | |
| parent | 97ab24feef0d3cb1da063a910e477823b693fba0 (diff) | |
container/initoverlay: check path equivalence by value
Fixes regression introduced while integrating Absolute.
Signed-off-by: Ophestra <cat@gensokyo.uk>
Diffstat (limited to 'container/initoverlay.go')
| -rw-r--r-- | container/initoverlay.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/container/initoverlay.go b/container/initoverlay.go index 718b965b..81b00b9e 100644 --- a/container/initoverlay.go +++ b/container/initoverlay.go @@ -163,11 +163,10 @@ func (o *MountOverlayOp) apply(state *setupState) error { func (o *MountOverlayOp) Is(op Op) bool { vo, ok := op.(*MountOverlayOp) - return ok && - o.Target == vo.Target && - slices.Equal(o.Lower, vo.Lower) && - o.Upper == vo.Upper && - o.Work == vo.Work + return ok && ((o == nil && vo == nil) || (o != nil && vo != nil && + o.Target != nil && vo.Target != nil && o.Target.Is(vo.Target) && + slices.EqualFunc(o.Lower, vo.Lower, func(a *Absolute, v *Absolute) bool { return a.Is(v) }) && + o.Upper.Is(vo.Upper) && o.Work.Is(vo.Work))) } func (*MountOverlayOp) prefix() string { return "mounting" } func (o *MountOverlayOp) String() string { |