Merge branch 'toolkit_no_pivot' into 'master'

add no-pivot option to toolkit

See merge request nvidia/container-toolkit/toolkit!3
This commit is contained in:
Renaud Gaubert 2020-02-01 01:17:49 +00:00
commit 60f165ad69
2 changed files with 5 additions and 0 deletions

View File

@ -26,6 +26,7 @@ type CLIConfig struct {
Debug *string `toml:"debug"` Debug *string `toml:"debug"`
Ldcache *string `toml:"ldcache"` Ldcache *string `toml:"ldcache"`
LoadKmods bool `toml:"load-kmods"` LoadKmods bool `toml:"load-kmods"`
NoPivot bool `toml:"no-pivot"`
NoCgroups bool `toml:"no-cgroups"` NoCgroups bool `toml:"no-cgroups"`
User *string `toml:"user"` User *string `toml:"user"`
Ldconfig *string `toml:"ldconfig"` Ldconfig *string `toml:"ldconfig"`
@ -49,6 +50,7 @@ func getDefaultHookConfig() (config HookConfig) {
Debug: nil, Debug: nil,
Ldcache: nil, Ldcache: nil,
LoadKmods: true, LoadKmods: true,
NoPivot: false,
NoCgroups: false, NoCgroups: false,
User: nil, User: nil,
Ldconfig: nil, Ldconfig: nil,

View File

@ -101,6 +101,9 @@ func doPrestart() {
if cli.LoadKmods { if cli.LoadKmods {
args = append(args, "--load-kmods") args = append(args, "--load-kmods")
} }
if cli.NoPivot {
args = append(args, "--no-pivot")
}
if *debugflag { if *debugflag {
args = append(args, "--debug=/dev/stderr") args = append(args, "--debug=/dev/stderr")
} else if cli.Debug != nil { } else if cli.Debug != nil {