fix the --no-pivot flag being ignored by ctr tasks start

Signed-off-by: Iceber Gu <wei.cai-nat@daocloud.io>
This commit is contained in:
Iceber Gu 2022-10-13 11:50:20 +08:00
parent 99ee82d0b6
commit 48daccb4dd
3 changed files with 7 additions and 5 deletions

View File

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

View File

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

View File

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