pve6to7: remember if cgroup is forced to legacy

[pve-manager.git] / PVE / CLI / pve6to7.pm

diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm
index 93456876361e1108d2f1f42bc0123edf9a62a5d7..25955a8929e7c2b969a10a35b929d9d19988af1f 100644 (file)
--- 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;
     }
@@ -1144,6 +1144,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();