Add --runtime-root to ctr

crosbymichael · crosbymichael · commit db687ff48516 · 2020-08-21T04:55:28.000-04:00
Signed-off-by: Michael Crosby &lt;michael@thepasture.io&gt;
diff --git a/cmd/ctr/commands/run/run_unix.go b/cmd/ctr/commands/run/run_unix.go
@@ -42,6 +42,10 @@ var platformRunFlags = []cli.Flag{
 		Name:  "runc-binary",
 		Usage: "specify runc-compatible binary",
 	},
+	cli.StringFlag{
+		Name:  "runc-root",
+		Usage: "specify runc-compatible root",
+	},
 	cli.BoolFlag{
 		Name:  "runc-systemd-cgroup",
 		Usage: "start runc with systemd cgroup manager",
@@ -263,6 +267,9 @@ func getRuncOptions(context *cli.Context) (*options.Options, error) {
 		}
 		runtimeOpts.SystemdCgroup = true
 	}
+	if root := context.String("runc-root"); root != "" {
+		runtimeOpts.Root = root
+	}
 
 	return runtimeOpts, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,10 @@ var platformRunFlags = []cli.Flag{`
`42`	`42`	`Name: "runc-binary",`
`43`	`43`	`Usage: "specify runc-compatible binary",`
`44`	`44`	`},`
	`45`	`+ cli.StringFlag{`
	`46`	`+ Name: "runc-root",`
	`47`	`+ Usage: "specify runc-compatible root",`
	`48`	`+ },`
`45`	`49`	`cli.BoolFlag{`
`46`	`50`	`Name: "runc-systemd-cgroup",`
`47`	`51`	`Usage: "start runc with systemd cgroup manager",`
`@@ -263,6 +267,9 @@ func getRuncOptions(context cli.Context) (options.Options, error) {`
`263`	`267`	`}`
`264`	`268`	`runtimeOpts.SystemdCgroup = true`
`265`	`269`	`}`
	`270`	`+ if root := context.String("runc-root"); root != "" {`
	`271`	`+ runtimeOpts.Root = root`
	`272`	`+ }`
`266`	`273`
`267`	`274`	`return runtimeOpts, nil`
`268`	`275`	`}`