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

Merge pull request #7519 from Iceber/fix_flags

Browse Source
This commit is contained in:
Samuel Karp 2022-10-13 11:21:17 -07:00 committed by GitHub
commit 6333c751ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/ctr/commands/tasks/start.go
View File

@ -31,7 +31,7 @@ var startCommand = cli.Command{
Name: "start", Name: "start",
Usage: "start a container that has been created", Usage: "start a container that has been created",
ArgsUsage: "CONTAINER", ArgsUsage: "CONTAINER",
Flags: []cli.Flag{ Flags: append(platformStartFlags, []cli.Flag{
cli.BoolFlag{ cli.BoolFlag{
Name: "null-io", Name: "null-io",
Usage: "send all IO to /dev/null", Usage: "send all IO to /dev/null",
@ -52,7 +52,7 @@ var startCommand = cli.Command{
Name: "detach,d", Name: "detach,d",
Usage: "detach from the task after it has started execution", Usage: "detach from the task after it has started execution",
}, },
}, }...),
Action: func(context *cli.Context) error { Action: func(context *cli.Context) error {
var ( var (
err error err error

6
cmd/ctr/commands/tasks/tasks_unix.go
View File

@ -34,11 +34,11 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
func init() { var platformStartFlags = []cli.Flag{
startCommand.Flags = append(startCommand.Flags, cli.BoolFlag{ cli.BoolFlag{
Name: "no-pivot", Name: "no-pivot",
Usage: "disable use of pivot-root (linux only)", Usage: "disable use of pivot-root (linux only)",
}) },
} }
// HandleConsoleResize resizes the console // HandleConsoleResize resizes the console

2
cmd/ctr/commands/tasks/tasks_windows.go
View File

@ -29,6 +29,8 @@ import (
"github.com/urfave/cli" "github.com/urfave/cli"
) )
var platformStartFlags = []cli.Flag{}
// HandleConsoleResize resizes the console // HandleConsoleResize resizes the console
func HandleConsoleResize(ctx gocontext.Context, task resizer, con console.Console) error { func HandleConsoleResize(ctx gocontext.Context, task resizer, con console.Console) error {
// do an initial resize of the console // do an initial resize of the console