Revert "main: exit if no Cgroups v2"

This reverts commit 2977f08.

Signed-off-by: Lokesh Mandvekar <[email protected]>

Author: lsm5

cmd/buildah/main.go

@@ -18,7 +18,6 @@ import (
 	rspecs "github.com/opencontainers/runtime-spec/specs-go"
 	"github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
-	cgroupv2 "go.podman.io/common/pkg/cgroupv2"
 	"go.podman.io/common/pkg/config"
 	"go.podman.io/storage"
 	"go.podman.io/storage/pkg/unshare"
@@ -228,14 +227,6 @@ func after(cmd *cobra.Command) error {
 }
 
 func main() {
-	cgroupsv2, err := cgroupv2.Enabled()
-	if err != nil {
-		logrus.Fatalf("Error reading cgroups mode")
-	}
-	if !cgroupsv2 {
-		logrus.Fatalf("Did not detect Cgroups v2 on your system. Please switch to Cgroups v2.")
-	}
-
 	if buildah.InitReexec() {
 		return
 	}

info.go

@@ -14,6 +14,7 @@ import (
 	"github.com/containers/buildah/util"
 	v1 "github.com/opencontainers/image-spec/specs-go/v1"
 	"github.com/sirupsen/logrus"
+	"go.podman.io/common/pkg/cgroups"
 	"go.podman.io/storage"
 	"go.podman.io/storage/pkg/system"
 	"go.podman.io/storage/pkg/unshare"
@@ -50,6 +51,10 @@ func hostInfo() map[string]any {
 	info["cpus"] = runtime.NumCPU()
 	info["rootless"] = unshare.IsRootless()
 
+	_, err := cgroups.IsCgroup2UnifiedMode()
+	if err != nil {
+		logrus.Error(err, "err reading cgroups mode")
+	}
 	ociruntime := util.Runtime()
 	info["OCIRuntime"] = ociruntime
 

internal/mkcw/embed/entrypoint_amd64.gz

@@ -489,7 +489,6 @@ go.podman.io/common/pkg/apparmor/internal/supported
 go.podman.io/common/pkg/auth
 go.podman.io/common/pkg/capabilities
 go.podman.io/common/pkg/cgroups
-go.podman.io/common/pkg/cgroupv2
 go.podman.io/common/pkg/chown
 go.podman.io/common/pkg/completion
 go.podman.io/common/pkg/config