Skip to content

Commit d089e0b

Browse files
committed
oci: fix error handling on submount calls
Signed-off-by: Tonis Tiigi <[email protected]> (cherry picked from commit 42d866e) (cherry picked from commit e81066f8a8623dc876f3d64fae8f693c17ecdc1a)
1 parent 00fe637 commit d089e0b

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

executor/oci/spec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,12 +230,12 @@ func (s *submounts) subMount(m mount.Mount, subPath string) (mount.Mount, error)
230230
}
231231
h, err := hashstructure.Hash(m, hashstructure.FormatV2, nil)
232232
if err != nil {
233-
return mount.Mount{}, nil
233+
return mount.Mount{}, err
234234
}
235235
if mr, ok := s.m[h]; ok {
236236
sm, err := sub(mr.mount, subPath)
237237
if err != nil {
238-
return mount.Mount{}, nil
238+
return mount.Mount{}, err
239239
}
240240
return sm, nil
241241
}

0 commit comments

Comments
 (0)