From 696e5938989dc5652dbf56686c289dd6994c9d4c Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 20 Aug 2025 17:33:15 +0900 Subject: container/initoverlay: check path equivalence by value Fixes regression introduced while integrating Absolute. Signed-off-by: Ophestra --- container/initoverlay.go | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'container/initoverlay.go') 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 { -- cgit v1.3.1