From: Dmytro Bagrii Date: Thu, 19 Feb 2026 00:27:47 +0000 (+0200) Subject: xorg/50-systemd-user: import XAUTHORITY only if set X-Git-Tag: v257.11~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a323ab9b3343df33be0ca5e5dd2c0ababae4d869;p=thirdparty%2Fsystemd.git xorg/50-systemd-user: import XAUTHORITY only if set The warning will still be reported if XAUTHORITY is set but not exported. However, such scenario is unlikely for xinitrc.d scripts environment. Fixes #40745 Signed-off-by: Dmytro Bagrii (cherry picked from commit 8df975bb6781d89fa5331e59b5f742e755a4967b) (cherry picked from commit 9902addee6bf49a9086cfcac65d6e66086ab9fcc) (cherry picked from commit 582708b0197cc2e4cb4cdda39eb4f48c6dad4d62) --- diff --git a/xorg/50-systemd-user.sh b/xorg/50-systemd-user.sh index fb03ecbec05..41b7c8a3b4d 100755 --- a/xorg/50-systemd-user.sh +++ b/xorg/50-systemd-user.sh @@ -8,7 +8,7 @@ # the Free Software Foundation; either version 2.1 of the License, or # (at your option) any later version. -systemctl --user import-environment DISPLAY XAUTHORITY +systemctl --user import-environment DISPLAY ${XAUTHORITY+XAUTHORITY} if command -v dbus-update-activation-environment >/dev/null 2>&1; then dbus-update-activation-environment DISPLAY XAUTHORITY