Checking /lib/systemd if it is present and a directory is not enough, as
the shared object file used to check the version might nevertheless be
located at /usr/lib/systemd, or under /usr/lib/x86_64-linux-gnu/systemd.
So check also the latter paths, if the former returned no match.
Further, Arch Linux appends the minor version and release version to the
filename, so include that in the regex as well.
Signed-off-by: Christian Ebner <c.eb...@proxmox.com>
---
Changes since v1:
- Also check for shared object in /usr/lib/x86_64-linux-gnu/systemd
PVE/CLI/pve7to8.pm | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/PVE/CLI/pve7to8.pm b/PVE/CLI/pve7to8.pm
index 6b51e98e..09e7cc65 100644
--- a/PVE/CLI/pve7to8.pm
+++ b/PVE/CLI/pve7to8.pm
@@ -1015,9 +1015,14 @@ sub check_containers_cgroup_compat {
my $get_systemd_version = sub {
my ($self) = @_;
- my $sd_lib_dir = -d "/lib/systemd" ? "/lib/systemd" :
"/usr/lib/systemd";
- my $libsd = PVE::Tools::dir_glob_regex($sd_lib_dir,
"libsystemd-shared-.+\.so");
- if (defined($libsd) && $libsd =~ /libsystemd-shared-(\d+)\.so/) {
+ my $libsd = PVE::Tools::dir_glob_regex("/lib/systemd",
"libsystemd-shared-.+\.so");
+ if (!defined($libsd)) {
+ $libsd = PVE::Tools::dir_glob_regex("/usr/lib/systemd",
"libsystemd-shared-.+\.so");
+ }
+ if (!defined($libsd)) {
+ $libsd =
PVE::Tools::dir_glob_regex("/usr/lib/x86_64-linux-gnu/systemd",
"libsystemd-shared-.+\.so");
+ }
+ if (defined($libsd) && $libsd =~
/libsystemd-shared-(\d+)(\.\d-\d)?\.so/) {
return $1;
}
--
2.39.2
_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel
