From 4da6463135f63658365d837e8d7dd69f0ca1468e Mon Sep 17 00:00:00 2001 From: Ophestra Date: Fri, 29 Aug 2025 02:04:09 +0900 Subject: container/init: unwrap path errors These are also now handled by init properly, so wrapping them in self is meaningless and unreachable. Signed-off-by: Ophestra --- container/initbind.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'container/initbind.go') diff --git a/container/initbind.go b/container/initbind.go index 932095b9..41097fa9 100644 --- a/container/initbind.go +++ b/container/initbind.go @@ -43,7 +43,7 @@ func (b *BindMountOp) Valid() bool { func (b *BindMountOp) early(_ *setupState, k syscallDispatcher) error { if b.Flags&BindEnsure != 0 { if err := k.mkdirAll(b.Source.String(), 0700); err != nil { - return wrapErrSelf(err) + return err } } @@ -52,7 +52,7 @@ func (b *BindMountOp) early(_ *setupState, k syscallDispatcher) error { // leave sourceFinal as nil return nil } - return wrapErrSelf(err) + return err } else { b.sourceFinal, err = NewAbs(pathname) return err @@ -74,10 +74,10 @@ func (b *BindMountOp) apply(_ *setupState, k syscallDispatcher) error { // this perm value emulates bwrap behaviour as it clears bits from 0755 based on // op->perms which is never set for any bind setup op so always results in 0700 if fi, err := k.stat(source); err != nil { - return wrapErrSelf(err) + return err } else if fi.IsDir() { if err = k.mkdirAll(target, 0700); err != nil { - return wrapErrSelf(err) + return err } } else if err = k.ensureFile(target, 0444, 0700); err != nil { return err -- cgit v1.3.1