diff options
| author | Fabricio Voznika <fvoznika@google.com> | 2021-07-13 11:33:49 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2021-07-13 11:36:13 -0700 |
| commit | c16e69a9d5ec3422b648a6d32842442925285a29 (patch) | |
| tree | f6c7aab2d8c7fb8df0cd607b0b12298fecd231ef /runsc/container | |
| parent | 1fe6db8c542431d3d6e229f563fefbd2f962fc81 (diff) | |
Use consistent naming for subcontainers
It was confusing to find functions relating to root and non-root
containers. Replace "non-root" and "subcontainer" and make naming
consistent in Sandbox and controller.
PiperOrigin-RevId: 384512518
Diffstat (limited to 'runsc/container')
| -rw-r--r-- | runsc/container/container.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/runsc/container/container.go b/runsc/container/container.go index 213fbc771..7f066905a 100644 --- a/runsc/container/container.go +++ b/runsc/container/container.go @@ -310,7 +310,7 @@ func New(conf *config.Config, args Args) (*Container, error) { defer tty.Close() } - if err := c.Sandbox.CreateContainer(conf, c.ID, tty); err != nil { + if err := c.Sandbox.CreateSubcontainer(conf, c.ID, tty); err != nil { return nil, err } } @@ -388,7 +388,7 @@ func (c *Container) Start(conf *config.Config) error { stdios = []*os.File{os.Stdin, os.Stdout, os.Stderr} } - return c.Sandbox.StartContainer(c.Spec, conf, c.ID, stdios, goferFiles) + return c.Sandbox.StartSubcontainer(c.Spec, conf, c.ID, stdios, goferFiles) }); err != nil { return err } |