Improve server.LoadConfig function
Cann't use the new created config in server.LoadConfig When arg v is nil fix #1483 Signed-off-by: yanxuean <yan.xuean@zte.com.cn>
This commit is contained in:
parent
bb7b41ad7b
commit
39b5f90b18
@ -5,6 +5,8 @@ import (
|
||||
"io"
|
||||
|
||||
"github.com/BurntSushi/toml"
|
||||
"github.com/containerd/containerd/errdefs"
|
||||
"github.com/pkg/errors"
|
||||
)
|
||||
|
||||
// Config provides containerd configuration data for the server
|
||||
@ -69,7 +71,7 @@ func (c *Config) WriteTo(w io.Writer) (int64, error) {
|
||||
// LoadConfig loads the containerd server config from the provided path
|
||||
func LoadConfig(path string, v *Config) error {
|
||||
if v == nil {
|
||||
v = &Config{}
|
||||
return errors.Wrapf(errdefs.ErrInvalidArgument, "argument v must not be nil")
|
||||
}
|
||||
md, err := toml.DecodeFile(path, v)
|
||||
if err != nil {
|
||||
|
Loading…
Reference in New Issue
Block a user