Merge branch 'master' into skip-subcontainer-update-v2

2017-08-17 15:53:35 -05:00 · 2017-08-17 15:53:35 -05:00 · 9a028b6cfd
commit 9a028b6cfd
parent 3ba4699c12 0df211fc30
1 changed files with 3 additions and 1 deletions
--- a/machine/info.go
+++ b/machine/info.go
@ -57,7 +57,9 @@ func GetHugePagesInfo() ([]info.HugePagesInfo, error) {
 	var hugePagesInfo []info.HugePagesInfo
 	files, err := ioutil.ReadDir(hugepagesDirectory)
 	if err != nil {
-		return hugePagesInfo, err
+		// treat as non-fatal since kernels and machine can be
+		// configured to disable hugepage support
+		return hugePagesInfo, nil
 	}
 	for _, st := range files {
 		nameArray := strings.Split(st.Name(), "-")