qubes-gui-runner: load environment variables from systemd earlier

qubes-session previously loaded environment variables from
`systemctl --user show-environment`, so that variables set using systemd
environment generators would be present in the user session. However,
doing this meant any environment variables defined or augmented by
scripts under /etc/profile.d could be clobbered by versions of those
same variables from the systemd user instance, resulting in application
misbehavior in some instances.

To fix this, load all environment variables from systemd's user instance
in /etc/profile.d itself.

Fixes: QubesOS/qubes-issues#10299

Author: ArrayBolt3

Makefile

@@ -194,6 +194,8 @@ install-common:
 		$(DESTDIR)/etc/X11/xorg-qubes-x11vnc.conf.template
 	install -m 0644 -D appvm-scripts/etc/systemd/system/lightdm.service.d/qubes-guivm-vnc.conf \
 		$(DESTDIR)$(UNITDIR)/lightdm.service.d/qubes-guivm-vnc.conf
+	install -m 0644 -D appvm-scripts/etc/profile.d/00-qubes-systemd-env-import.sh \
+		$(DESTDIR)/etc/profile.d/00-qubes-systemd-env-import.sh
 	install -m 0644 -D appvm-scripts/etc/profile.d/qubes-gui.sh \
 		$(DESTDIR)/etc/profile.d/qubes-gui.sh
 	install -m 0644 -D appvm-scripts/etc/profile.d/qubes-gui.csh \

appvm-scripts/etc/profile.d/00-qubes-systemd-env-import.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# Import the environment from the systemd user session.
+# This is necessary to enable users to configure their
+# Qubes environment using the standard environment.d
+# facility.  Documentation for the facility is at:
+# https://www.freedesktop.org/software/systemd/man/environment.d.html
+set -a # export all variables
+env=$(systemctl --user show-environment) && eval "$env" || exit
+set +a
+unset env

appvm-scripts/usrbin/qubes-session

@@ -27,16 +27,6 @@
 
 loginctl activate "$XDG_SESSION_ID"
 
-# Now import the environment from the systemd user session.
-# This is necessary to enable users to configure their
-# Qubes environment using the standard environment.d
-# facility.  Documentation for the facility is at:
-# https://www.freedesktop.org/software/systemd/man/environment.d.html
-set -a # export all variables
-env=$(systemctl --user show-environment) && eval "$env" || exit
-set +a
-unset env
-
 
 if qsvc guivm-gui-agent; then
     if [ -e "$HOME/.xinitrc" ]; then

debian/qubes-gui-agent.install

@@ -5,6 +5,7 @@ etc/X11/Xsession.d/50guivm-windows-prefix
 etc/X11/xorg-qubes.conf.template
 etc/profile.d/qubes-gui.sh
 etc/profile.d/qubes-gui.csh
+etc/profile.d/00-qubes-systemd-env-import.sh
 etc/pam.d/qubes-gui-agent
 etc/security/limits.d/90-qubes-gui.conf
 etc/qubes-rpc/qubes.SetMonitorLayout

rpm_spec/gui-agent.spec.in

@@ -301,6 +301,7 @@ rm -f %{name}-%{version}
 %attr(0644,root,root) /etc/X11/xorg-qubes.conf.template
 /etc/profile.d/qubes-gui.sh
 /etc/profile.d/qubes-gui.csh
+/etc/profile.d/00-qubes-systemd-env-import.sh
 %if 0%{?is_opensuse}
 /usr/lib/pam.d/qubes-gui-agent
 %else