Merge pull request #909 from alicefr/add_archConvertStatFs

build: introduction of archConvertStatFs function
kata-containers · Nov 16, 2018 · c0551de · c0551de
2 parents 23e75f0 + b185f31
commit c0551de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/cli/oci.go b/cli/oci.go
@@ -123,7 +123,7 @@ func isCgroupMounted(cgroupPath string) bool {
 		return false
 	}
 
-	if statFs.Type != int64(cgroupFsType) {
+	if statFs.Type != archConvertStatFs(cgroupFsType) {
 		return false
 	}
 

diff --git a/cli/utils_arch_base.go b/cli/utils_arch_base.go
@@ -0,0 +1,10 @@
+// +build !s390x
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+package main
+
+func archConvertStatFs(cgroupFsType int) int64 {
+	return int64(cgroupFsType)
+}