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/initdev.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'container/initdev.go') diff --git a/container/initdev.go b/container/initdev.go index 9bb95611..58e89718 100644 --- a/container/initdev.go +++ b/container/initdev.go @@ -59,7 +59,7 @@ func (d *MountDevOp) apply(state *setupState, k syscallDispatcher) error { FHSProc+"self/fd/"+string(rune(i+'0')), path.Join(target, name), ); err != nil { - return wrapErrSelf(err) + return err } } for _, pair := range [][2]string{ @@ -68,7 +68,7 @@ func (d *MountDevOp) apply(state *setupState, k syscallDispatcher) error { {"pts/ptmx", "ptmx"}, } { if err := k.symlink(pair[0], path.Join(target, pair[1])); err != nil { - return wrapErrSelf(err) + return err } } @@ -76,7 +76,7 @@ func (d *MountDevOp) apply(state *setupState, k syscallDispatcher) error { devPtsPath := path.Join(target, "pts") for _, name := range []string{devShmPath, devPtsPath} { if err := k.mkdir(name, state.ParentPerm); err != nil { - return wrapErrSelf(err) + return err } } @@ -92,7 +92,7 @@ func (d *MountDevOp) apply(state *setupState, k syscallDispatcher) error { return err } if name, err := k.readlink(hostProc.stdout()); err != nil { - return wrapErrSelf(err) + return err } else if err = k.bindMount( toHost(name), consolePath, @@ -107,7 +107,7 @@ func (d *MountDevOp) apply(state *setupState, k syscallDispatcher) error { if d.Mqueue { mqueueTarget := path.Join(target, "mqueue") if err := k.mkdir(mqueueTarget, state.ParentPerm); err != nil { - return wrapErrSelf(err) + return err } if err := k.mount(SourceMqueue, mqueueTarget, FstypeMqueue, MS_NOSUID|MS_NOEXEC|MS_NODEV, zeroString); err != nil { return err -- cgit v1.3.1