proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-07-25 21:16:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pve6to7: handle undefined ostype

Browse Source 
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-07-05 17:37:40 +02:00
parent 3d779b1274
commit ca0c50a1e6
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PVE/CLI/pve6to7.pm
View File

@ -903,7 +903,7 @@ sub check_containers_cgroup_compat {
} }
my $supports_cgroupv2 = sub { my $supports_cgroupv2 = sub {
my ($conf, $rootdir) = @_; my ($conf, $rootdir, $ctid) = @_;
my $get_systemd_version = sub { my $get_systemd_version = sub {
my ($self) = @_; my ($self) = @_;
@ -939,8 +939,10 @@ sub check_containers_cgroup_compat {
}; };
my $ostype = $conf->{ostype}; my $ostype = $conf->{ostype};
if ($ostype eq 'devuan' || $ostype eq 'alpine') { if (!defined($ostype)) {
return 1; log_warn("Found CT ($ctid) without 'ostype' set!");
} elsif ($ostype eq 'devuan' || $ostype eq 'alpine') {
return 1; # no systemd, no cgroup problems
} }
my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir); my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir);
@ -979,7 +981,7 @@ sub check_containers_cgroup_compat {
my $rootdir = "/proc/$pid/root"; my $rootdir = "/proc/$pid/root";
my $conf = PVE::LXC::Config->load_config($ctid); my $conf = PVE::LXC::Config->load_config($ctid);
my $ret = eval { $supports_cgroupv2->($conf, $rootdir) }; my $ret = eval { $supports_cgroupv2->($conf, $rootdir, $ctid) };
if (my $err = $@) { if (my $err = $@) {
log_warn("Failed to get cgroup support status for CT $ctid - $err"); log_warn("Failed to get cgroup support status for CT $ctid - $err");
next; next;
@ -997,7 +999,7 @@ sub check_containers_cgroup_compat {
eval { eval {
$conf = PVE::LXC::Config->load_config($ctid); $conf = PVE::LXC::Config->load_config($ctid);
$rootdir = PVE::LXC::mount_all($ctid, $storage_cfg, $conf); $rootdir = PVE::LXC::mount_all($ctid, $storage_cfg, $conf);
$ret = $supports_cgroupv2->($conf, $rootdir); $ret = $supports_cgroupv2->($conf, $rootdir, $ctid);
}; };
if (my $err = $@) { if (my $err = $@) {
log_warn("Failed to load config and mount CT $ctid - $err"); log_warn("Failed to load config and mount CT $ctid - $err");