Merge pull request #238 from lathiat/fix-cgroupsv2

Fix LXC/LXD and machined detection for cgroups v2
liske · Mar 16, 2022 · eb3531a · eb3531a
2 parents 4e3c2b4 + 8465c3e
commit eb3531a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/perl/lib/NeedRestart/CONT/LXC.pm b/perl/lib/NeedRestart/CONT/LXC.pm
@@ -81,7 +81,7 @@ sub check {
     }
 
     # look for LXC cgroups
-    return unless($cg =~ /^\d+:[^:]+:\/lxc(?:.payload)?[.\/]([^\/\n]+)($|\/)/m);
+    return unless($cg =~ /^\d+:[^:]*:\/lxc(?:.payload)?[.\/]([^\/\n]+)($|\/)/m);
 
     my $name = $1;
     my $type = ($self->{has_lxd} && -d qq($self->{lxd_container_path}/$name) ? 'LXD' : 'LXC');

diff --git a/perl/lib/NeedRestart/CONT/machined.pm b/perl/lib/NeedRestart/CONT/machined.pm
@@ -68,7 +68,7 @@ sub check {
     }
 
     # look for machined cgroups
-    return 0 unless($cg =~ /^\d+:[^:]+:\/machine.slice\/machine-(.+)\.scope$/m);
+    return 0 unless($cg =~ /^\d+:[^:]*:\/machine.slice\/machine-(.+)\.scope$/m);
 
     my $name = $1;
     unless($norestart) {