github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Do not return error when rootfs already exists.

Browse Source 
Signed-off-by: Lantao Liu <lantaol@google.com>
This commit is contained in:
Lantao Liu 2019-05-22 15:48:21 -07:00
parent 25daa7355c
commit 48b81e872c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
runtime/v1/shim/service.go
View File

@ -127,7 +127,7 @@ func (s *Service) Create(ctx context.Context, r *shimapi.CreateTaskRequest) (_ *
rootfs := "" rootfs := ""
if len(mounts) > 0 { if len(mounts) > 0 {
rootfs = filepath.Join(r.Bundle, "rootfs") rootfs = filepath.Join(r.Bundle, "rootfs")
if err := os.Mkdir(rootfs, 0711); err != nil { if err := os.Mkdir(rootfs, 0711); err != nil && !os.IsExist(err) {
return nil, err return nil, err
} }
} }

2
runtime/v2/runc/container.go
View File

@ -68,7 +68,7 @@ func NewContainer(ctx context.Context, platform rproc.Platform, r *task.CreateTa
rootfs := "" rootfs := ""
if len(mounts) > 0 { if len(mounts) > 0 {
rootfs = filepath.Join(r.Bundle, "rootfs") rootfs = filepath.Join(r.Bundle, "rootfs")
if err := os.Mkdir(rootfs, 0711); err != nil { if err := os.Mkdir(rootfs, 0711); err != nil && !os.IsExist(err) {
return nil, err return nil, err
} }
} }