Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,8 @@ install-pipewire:
install-systemd:
install -m 0644 -D appvm-scripts/qubes-gui-agent.service \
$(DESTDIR)$(UNITDIR)/qubes-gui-agent.service
install -m 0644 -D appvm-scripts/lib/systemd/user/qubes-graphical-session.target \
$(DESTDIR)$(USERUNITDIR)/qubes-graphical-session.target

.PHONY: install-common
install-common:
Expand Down
3 changes: 3 additions & 0 deletions appvm-scripts/lib/systemd/user/qubes-graphical-session.target
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Unit]
Description=Qubes graphical session
BindsTo=graphical-session.target
5 changes: 5 additions & 0 deletions appvm-scripts/usrbin/qubes-session
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,11 @@ UPDTYPE=$(/usr/bin/qubesdb-read /qubes-vm-updateable)
# manager and dbus-daemon
dbus-update-activation-environment --systemd --all

if command -v systemctl >/dev/null && [ -e "${XDG_RUNTIME_DIR:-/run/user/$UID}/systemd" ]; then
trap "systemctl --user stop qubes-graphical-session.target" EXIT
systemctl --user start qubes-graphical-session.target
fi

# process /etc/xdg/autostart and friends (according to Desktop Application
# Autostart Specification)
/usr/bin/qubes-session-autostart QUBES X-QUBES "X-$VMTYPE" "X-$UPDTYPE"
Expand Down
1 change: 1 addition & 0 deletions debian/qubes-gui-agent.install
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ etc/xdg/xsettingsd
lib/systemd/system/qubes-gui-agent.service
lib/udev/rules.d/70-master-of-seat.rules
lib/udev/rules.d/90-qubes-virtual-input-device.rules
lib/systemd/user/qubes-graphical-session.target
usr/bin/qubes-change-keyboard-layout
usr/bin/qubes-gui
usr/bin/qubes-gui-runuser
Expand Down
1 change: 1 addition & 0 deletions rpm_spec/gui-agent.spec.in
Original file line number Diff line number Diff line change
Expand Up @@ -328,6 +328,7 @@ rm -f %{name}-%{version}
%config /etc/sysconfig/desktop
%endif
%_unitdir/qubes-gui-agent.service
%{_userunitdir}/qubes-graphical-session.target
%_udevrulesdir/70-master-of-seat.rules
%_udevrulesdir/90-qubes-virtual-input-device.rules
%_sysctldir/30-qubes-gui-agent.conf
Expand Down