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

Merge pull request #4501 from crosbymichael/runtimeroot

Browse Source 
Add --runtime-root to ctr
This commit is contained in:
Maksym Pavlenko 2020-08-25 13:46:36 -07:00 committed by GitHub
commit 27402021ac
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmd/ctr/commands/run/run_unix.go
View File

@ -42,6 +42,10 @@ var platformRunFlags = []cli.Flag{
Name: "runc-binary", Name: "runc-binary",
Usage: "specify runc-compatible binary", Usage: "specify runc-compatible binary",
}, },
cli.StringFlag{
Name: "runc-root",
Usage: "specify runc-compatible root",
},
cli.BoolFlag{ cli.BoolFlag{
Name: "runc-systemd-cgroup", Name: "runc-systemd-cgroup",
Usage: "start runc with systemd cgroup manager", Usage: "start runc with systemd cgroup manager",
@ -263,6 +267,9 @@ func getRuncOptions(context *cli.Context) (*options.Options, error) {
} }
runtimeOpts.SystemdCgroup = true runtimeOpts.SystemdCgroup = true
} }
if root := context.String("runc-root"); root != "" {
runtimeOpts.Root = root
}
return runtimeOpts, nil return runtimeOpts, nil
} }