diff options
| author | gVisor bot <gvisor-bot@google.com> | 2020-10-23 05:11:12 +0000 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-10-23 05:11:12 +0000 |
| commit | 91d7460880c16fe0025540db48721c75d9609df3 (patch) | |
| tree | e2fd17fa74d6f636b6261969f46b6b58dddb7fb9 | |
| parent | f7b2cfd51f242263e1425b240cecfb43275746b8 (diff) | |
| parent | 293877cf647ac3e900f0ae15061317a512bba7a0 (diff) | |
Merge release-20201019.0-33-g293877cf6 (automated)
| -rw-r--r-- | runsc/boot/loader.go | 2 | ||||
| -rw-r--r-- | runsc/cmd/start.go | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/runsc/boot/loader.go b/runsc/boot/loader.go index 8ad000497..a971d20ec 100644 --- a/runsc/boot/loader.go +++ b/runsc/boot/loader.go @@ -737,7 +737,7 @@ func (l *Loader) createContainerProcess(root bool, cid string, info *containerIn return nil, err } - // Add the HOME enviroment variable if it is not already set. + // Add the HOME environment variable if it is not already set. var envv []string if kernel.VFS2Enabled { envv, err = user.MaybeAddExecUserHomeVFS2(ctx, info.procArgs.MountNamespaceVFS2, diff --git a/runsc/cmd/start.go b/runsc/cmd/start.go index 88991b521..139edbd49 100644 --- a/runsc/cmd/start.go +++ b/runsc/cmd/start.go @@ -21,6 +21,7 @@ import ( "gvisor.dev/gvisor/runsc/config" "gvisor.dev/gvisor/runsc/container" "gvisor.dev/gvisor/runsc/flag" + "gvisor.dev/gvisor/runsc/specutils" ) // Start implements subcommands.Command for the "start" command. @@ -58,6 +59,12 @@ func (*Start) Execute(_ context.Context, f *flag.FlagSet, args ...interface{}) s if err != nil { Fatalf("loading container: %v", err) } + // Read the spec again here to ensure flag annotations from the spec are + // applied to "conf". + if _, err := specutils.ReadSpec(c.BundleDir, conf); err != nil { + Fatalf("reading spec: %v", err) + } + if err := c.Start(conf); err != nil { Fatalf("starting container: %v", err) } |