From 06f915e63f3a04a8f55c9846f23ff9b05b6b2d0e Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Wed, 7 Jul 2021 12:40:43 +0200
Subject: [PATCH] pve6to7: remember if  cgroup is forced to legacy

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 PVE/CLI/pve6to7.pm | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
index a4a0bc67..a47375e9 100644
--- a/PVE/CLI/pve6to7.pm
+++ b/PVE/CLI/pve6to7.pm
@@ -44,6 +44,8 @@ my $min_pve_major = 6;
 my $min_pve_minor = 4;
 my $min_pve_pkgrel = 1;
 
+my $forced_legacy_cgroup = 0;
+
 my $counters = {
     pass => 0,
     skip => 0,
@@ -874,9 +876,7 @@ sub check_storage_content {
 }
 
 sub check_containers_cgroup_compat {
-
-    my $kernel_cli = PVE::Tools::file_get_contents('/proc/cmdline');
-    if ($kernel_cli =~ /systemd.unified_cgroup_hierarchy=0/){
+    if ($forced_legacy_cgroup) {
 	log_skip("System explicitly configured for legacy hybrid cgroup hierarchy.");
 	return;
     }
@@ -1137,6 +1137,11 @@ __PACKAGE__->register_method ({
     code => sub {
 	my ($param) = @_;
 
+	my $kernel_cli = PVE::Tools::file_get_contents('/proc/cmdline');
+	if ($kernel_cli =~ /systemd.unified_cgroup_hierarchy=0/){
+	    $forced_legacy_cgroup = 1;
+	}
+
 	check_pve_packages();
 	check_cluster_corosync();
 	check_ceph();