Skip to content

Commit 3d8a278

Browse files
authored
Merge pull request #4722 from kolyshkin/rm-criu-opt
Completely remove --criu option
2 parents f1eaad8 + 1d78cb2 commit 3d8a278

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

main.go

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,6 @@ func main() {
101101
Value: root,
102102
Usage: "root directory for storage of container state (this should be located in tmpfs)",
103103
},
104-
cli.StringFlag{
105-
Name: "criu",
106-
Usage: "(obsoleted; do not use)",
107-
Hidden: true,
108-
},
109104
cli.BoolFlag{
110105
Name: "systemd-cgroup",
111106
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() {
152147
if err := reviseRootDir(context); err != nil {
153148
return err
154149
}
155-
// TODO: remove this in runc 1.3.0.
156-
if context.IsSet("criu") {
157-
fmt.Fprintln(os.Stderr, "WARNING: --criu ignored (criu binary from $PATH is used); do not use")
158-
}
159150

160151
return configLogrus(context)
161152
}

0 commit comments

Comments
 (0)