Merge pull request #864 from mlaventure/revert-rootfs-error
Revert "Merge pull request #853 from AkihiroSuda/check-rootfs"
This commit is contained in:
commit
cd282f458a
@ -123,9 +123,6 @@ func (r *Runtime) Create(ctx context.Context, id string, opts plugin.CreateOpts)
|
||||
Options: m.Options,
|
||||
})
|
||||
}
|
||||
if len(sopts.Rootfs) == 0 {
|
||||
return nil, fmt.Errorf("no rootfs was specified for id %s", id)
|
||||
}
|
||||
if _, err = s.Create(ctx, sopts); err != nil {
|
||||
os.RemoveAll(path)
|
||||
return nil, err
|
||||
|
@ -11,7 +11,6 @@ import (
|
||||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/pkg/errors"
|
||||
"golang.org/x/sys/unix"
|
||||
|
||||
"github.com/containerd/console"
|
||||
@ -37,9 +36,6 @@ type initProcess struct {
|
||||
}
|
||||
|
||||
func newInitProcess(context context.Context, path string, r *shimapi.CreateRequest) (*initProcess, error) {
|
||||
if len(r.Rootfs) == 0 {
|
||||
return nil, errors.New("no rootfs was specified")
|
||||
}
|
||||
for _, rm := range r.Rootfs {
|
||||
m := &containerd.Mount{
|
||||
Type: rm.Type,
|
||||
|
Loading…
Reference in New Issue
Block a user