Package: sosreport Version: 4.0-1 Severity: normal Tags: patch User: pkg-systemd-maintain...@lists.alioth.debian.org Usertags: resolvectl
Hi, systemd-resolve has been replaced by the resolvectl tool in systemd v239 (i.e. is available since buster). This is from the systemd release notes: * The systemd-resolve tool has been renamed to resolvectl (it also remains available under the old name, for compatibility), and its interface is now verb-based, similar in style to the other <xyz>ctl tools, such as systemctl or loginctl. systemd-resolve is nowadays merely a symlink pointing at resolvectl and we'd like to get rid of this compat symlink at some point. Your package uses the old name like this: $ grep -E "systemd-resolve\b" -R sos/plugins/systemd.py: "systemd-resolve --status", sos/plugins/systemd.py: "systemd-resolve --statistics", Attached is a patch which uses resolvectl instead. Please review and consider applying it in your next upload. It would be great if you can make this upload before the bullseye release, so we can safely drop the symlink in bullseye+1. Regards, Michael -- System Information: Debian Release: bullseye/sid APT prefers unstable APT policy: (500, 'unstable'), (200, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.10.0-1-amd64 (SMP w/4 CPU threads) Kernel taint flags: TAINT_FIRMWARE_WORKAROUND Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages sosreport depends on: ii python3 3.9.1-1 ii python3-pexpect 4.6.0-4 sosreport recommends no packages. sosreport suggests no packages.
diff --git a/sos/plugins/systemd.py b/sos/plugins/systemd.py index cd21d517..7637f956 100644 --- a/sos/plugins/systemd.py +++ b/sos/plugins/systemd.py @@ -44,8 +44,8 @@ class Systemd(Plugin, RedHatPlugin, DebianPlugin, UbuntuPlugin): "systemd-analyze", "systemd-analyze blame", "systemd-analyze dump", - "systemd-resolve --status", - "systemd-resolve --statistics", + "resolvectl status", + "resolvectl statistics", "journalctl --list-boots", "ls -lR /lib/systemd", "timedatectl"