mirror of
https://github.com/opencontainers/runc.git
synced 2025-04-18 19:44:09 +03:00
Merge pull request #4722 from kolyshkin/rm-criu-opt
Completely remove --criu option
This commit is contained in:
commit
3d8a278bdd
9
main.go
9
main.go
@ -101,11 +101,6 @@ func main() {
|
||||
Value: root,
|
||||
Usage: "root directory for storage of container state (this should be located in tmpfs)",
|
||||
},
|
||||
cli.StringFlag{
|
||||
Name: "criu",
|
||||
Usage: "(obsoleted; do not use)",
|
||||
Hidden: true,
|
||||
},
|
||||
cli.BoolFlag{
|
||||
Name: "systemd-cgroup",
|
||||
Usage: "enable systemd cgroup support, expects cgroupsPath to be of form \"slice:prefix:name\" for e.g. \"system.slice:runc:434234\"",
|
||||
@ -152,10 +147,6 @@ func main() {
|
||||
if err := reviseRootDir(context); err != nil {
|
||||
return err
|
||||
}
|
||||
// TODO: remove this in runc 1.3.0.
|
||||
if context.IsSet("criu") {
|
||||
fmt.Fprintln(os.Stderr, "WARNING: --criu ignored (criu binary from $PATH is used); do not use")
|
||||
}
|
||||
|
||||
return configLogrus(context)
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user