From 51304b03af49efc66926f259507aa3a208535890 Mon Sep 17 00:00:00 2001 From: Ophestra Date: Wed, 20 Aug 2025 19:55:51 +0900 Subject: container/initremount: check path equivalence by value Fixes regression introduced while integrating Absolute. Signed-off-by: Ophestra --- container/initremount.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'container/initremount.go') diff --git a/container/initremount.go b/container/initremount.go index 2b290af0..77efc21d 100644 --- a/container/initremount.go +++ b/container/initremount.go @@ -29,6 +29,11 @@ func (r *RemountOp) apply(*setupState) error { fmt.Sprintf("cannot remount %q:", r.Target)) } -func (r *RemountOp) Is(op Op) bool { vr, ok := op.(*RemountOp); return ok && *r == *vr } +func (r *RemountOp) Is(op Op) bool { + vr, ok := op.(*RemountOp) + return ok && ((r == nil && vr == nil) || + (r.Target != nil && vr.Target != nil && r.Target.Is(vr.Target)) && + r.Flags == vr.Flags) +} func (*RemountOp) prefix() string { return "remounting" } func (r *RemountOp) String() string { return fmt.Sprintf("%q flags %#x", r.Target, r.Flags) } -- cgit v1.3.1