Merge pull request #14732 from dfr/criu

Add missing criu symbols to criu_unsupported.go

4 files changed, 53 insertions, 44 deletions

diff --git a/libpod/container_internal_linux.go b/libpod/container_internal_linux.go
index 10f4eeec1..0f4bf0f55 100644
--- a/libpod/container_internal_linux.go
+++ b/libpod/container_internal_linux.go
@@ -1142,7 +1142,7 @@ func (c *Container) addCheckpointImageMetadata(importBuilder *buildah.Builder) e
 		return fmt.Errorf("getting host info: %v", err)
 	}
 
-	criuVersion, err := criu.GetCriuVestion()
+	criuVersion, err := criu.GetCriuVersion()
 	if err != nil {
 		return fmt.Errorf("getting criu version: %v", err)
 	}
diff --git a/pkg/criu/criu.go b/pkg/criu/criu.go
index 6570159d7..0b0bbff5d 100644
--- a/pkg/criu/criu.go
+++ b/pkg/criu/criu.go
@@ -1,51 +1,8 @@
-//go:build linux
-// +build linux
-
 package criu
 
-import (
-	"github.com/checkpoint-restore/go-criu/v5"
-	"github.com/checkpoint-restore/go-criu/v5/rpc"
-
-	"google.golang.org/protobuf/proto"
-)
-
 // MinCriuVersion for Podman at least CRIU 3.11 is required
 const MinCriuVersion = 31100
 
 // PodCriuVersion is the version of CRIU needed for
 // checkpointing and restoring containers out of and into Pods.
 const PodCriuVersion = 31600
-
-// CheckForCriu uses CRIU's go bindings to check if the CRIU
-// binary exists and if it at least the version Podman needs.
-func CheckForCriu(version int) bool {
-	c := criu.MakeCriu()
-	result, err := c.IsCriuAtLeast(version)
-	if err != nil {
-		return false
-	}
-	return result
-}
-
-func GetCriuVestion() (int, error) {
-	c := criu.MakeCriu()
-	return c.GetCriuVersion()
-}
-
-func MemTrack() bool {
-	features, err := criu.MakeCriu().FeatureCheck(
-		&rpc.CriuFeatures{
-			MemTrack: proto.Bool(true),
-		},
-	)
-	if err != nil {
-		return false
-	}
-
-	if features == nil || features.MemTrack == nil {
-		return false
-	}
-
-	return *features.MemTrack
-}
diff --git a/pkg/criu/criu_linux.go b/pkg/criu/criu_linux.go
new file mode 100644
index 000000000..c28e23fd7
--- /dev/null
+++ b/pkg/criu/criu_linux.go
@@ -0,0 +1,44 @@
+//go:build linux
+// +build linux
+
+package criu
+
+import (
+	"github.com/checkpoint-restore/go-criu/v5"
+	"github.com/checkpoint-restore/go-criu/v5/rpc"
+
+	"google.golang.org/protobuf/proto"
+)
+
+// CheckForCriu uses CRIU's go bindings to check if the CRIU
+// binary exists and if it at least the version Podman needs.
+func CheckForCriu(version int) bool {
+	c := criu.MakeCriu()
+	result, err := c.IsCriuAtLeast(version)
+	if err != nil {
+		return false
+	}
+	return result
+}
+
+func MemTrack() bool {
+	features, err := criu.MakeCriu().FeatureCheck(
+		&rpc.CriuFeatures{
+			MemTrack: proto.Bool(true),
+		},
+	)
+	if err != nil {
+		return false
+	}
+
+	if features == nil || features.MemTrack == nil {
+		return false
+	}
+
+	return *features.MemTrack
+}
+
+func GetCriuVersion() (int, error) {
+	c := criu.MakeCriu()
+	return c.GetCriuVersion()
+}
diff --git a/pkg/criu/criu_unsupported.go b/pkg/criu/criu_unsupported.go
index 3e3ed9c6c..437482a0e 100644
--- a/pkg/criu/criu_unsupported.go
+++ b/pkg/criu/criu_unsupported.go
@@ -3,6 +3,14 @@
 
 package criu
 
+func CheckForCriu(version int) bool {
+	return false
+}
+
 func MemTrack() bool {
 	return false
 }
+
+func GetCriuVersion() (int, error) {
+	return MinCriuVersion, nil
+}