Package: ppp
Version: 2.4.8-1+2
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 packages uses the old name like this:
$ grep -E "systemd-resolve\b" -R
debian/extra/ip-up.d/0000usepeerdns:[ -x /usr/bin/systemd-resolve ] && \
debian/extra/ip-up.d/0000usepeerdns: /usr/bin/systemd-resolve --status
>/dev/null &&
debian/extra/ip-down.d/0000usepeerdns:[ -x /usr/bin/systemd-resolve ] && \
debian/extra/ip-down.d/0000usepeerdns: /usr/bin/systemd-resolve --status
>/dev/null &&
I first considered replacing that with "resolvectl status", but the
attached patch using "systemctl is-active" might be even better.
Please review and consider applying it in your next upload.
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 ppp depends on:
ii libc6 2.31-7
ii libcrypt1 1:4.4.17-1
ii libpam-modules 1.4.0-2
ii libpam-runtime 1.4.0-2
ii libpam0g 1.4.0-2
ii libpcap0.8 1.10.0-1
ii libssl1.1 1.1.1i-1
ii libsystemd0 247.2-4
ii procps 2:3.3.16-5
ppp recommends no packages.
ppp suggests no packages.
-- no debconf information
diff --git a/debian/extra/ip-down.d/0000usepeerdns
b/debian/extra/ip-down.d/0000usepeerdns
index 48e7ea3..bc4f158 100755
--- a/debian/extra/ip-down.d/0000usepeerdns
+++ b/debian/extra/ip-down.d/0000usepeerdns
@@ -4,8 +4,8 @@
[ -x /sbin/resolvconf ] && exit 0
# exit if systemd-resolved is running
-[ -x /usr/bin/systemd-resolve ] && \
- /usr/bin/systemd-resolve --status >/dev/null &&
+[ -e /run/systemd/system ] && \
+ systemctl is-active --quiet systemd-resolved.service &&
exit 0
# follow any symlink to find the real file
diff --git a/debian/extra/ip-up.d/0000usepeerdns
b/debian/extra/ip-up.d/0000usepeerdns
index 2a419e7..ea92770 100755
--- a/debian/extra/ip-up.d/0000usepeerdns
+++ b/debian/extra/ip-up.d/0000usepeerdns
@@ -7,8 +7,8 @@
[ -x /sbin/resolvconf ] && exit 0
# exit if systemd-resolved is running
-[ -x /usr/bin/systemd-resolve ] && \
- /usr/bin/systemd-resolve --status >/dev/null &&
+[ -e /run/systemd/system ] && \
+ systemctl is-active --quiet systemd-resolved.service &&
exit 0
# create the file if it does not exist
