From b0d3095fd6cc1791a38f57a1982116b4475244ba Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Mon, 12 Jun 2023 02:15:19 +0100 Subject: Drop split-usr and unmerged-usr support As previously announced, execute order 66: https://lists.freedesktop.org/archives/systemd-devel/2022-September/048352.html The meson options split-usr, rootlibdir and rootprefix become no-ops that print a warning if they are set to anything other than the default values. We can remove them in a future release. --- shell-completion/bash/systemctl.in | 2 +- shell-completion/zsh/_systemctl.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'shell-completion') diff --git a/shell-completion/bash/systemctl.in b/shell-completion/bash/systemctl.in index 480b3b5ae1..9c730846fc 100644 --- a/shell-completion/bash/systemctl.in +++ b/shell-completion/bash/systemctl.in @@ -11,7 +11,7 @@ __systemctl() { } __systemd_properties() { - {{ROOTLIBEXECDIR}}/systemd --dump-bus-properties + {{LIBEXECDIR}}/systemd --dump-bus-properties } __contains_word () { diff --git a/shell-completion/zsh/_systemctl.in b/shell-completion/zsh/_systemctl.in index 7ce7c4c015..06a4be6b33 100644 --- a/shell-completion/zsh/_systemctl.in +++ b/shell-completion/zsh/_systemctl.in @@ -454,7 +454,7 @@ done (( $+functions[_systemctl_unit_properties] )) || _systemctl_unit_properties() { - local -a _sys_all_properties=( ${(f)"$({{ROOTLIBEXECDIR}}/systemd --no-pager --dump-bus-properties 2>/dev/null)"} ) + local -a _sys_all_properties=( ${(f)"$({{LIBEXECDIR}}/systemd --no-pager --dump-bus-properties 2>/dev/null)"} ) _wanted systemd-unit-properties expl 'unit property' \ _values -s , "${_sys_all_properties[@]}" } -- cgit v1.2.3