Merge branch 'CNT-2979/allow-empty-config' into 'main'

Return default config if config path is not found

See merge request nvidia/container-toolkit/container-toolkit!156
This commit is contained in:
Evan Lezar 2022-05-25 12:20:51 +00:00
commit b940294557
3 changed files with 3 additions and 2 deletions

View File

@ -2,6 +2,7 @@
## v1.10.0-rc.3
* Use default config instead of raising an error if config file cannot be found
* Ignore NVIDIA_REQUIRE_JETPACK* environment variables for requirement checks
* Fix bug in detection of Tegra systems where `/sys/devices/soc0/family` is ignored
* Fix bug where links to devices were detected as devices

View File

@ -61,7 +61,7 @@ func GetConfig() (*Config, error) {
tomlFile, err := os.Open(configFilePath)
if err != nil {
return nil, fmt.Errorf("failed to open config file %v: %v", configFilePath, err)
return getDefaultConfig(), nil
}
defer tomlFile.Close()

@ -1 +1 @@
Subproject commit c3f84ed12f1ccf46be397667bee171b3602ab750
Subproject commit 1f493e87b89ea5bc6facb730afbfae7ab6f63b5f