Skip to content

Set user session stop timeout in all templates #629

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marmarek merged 1 commit into from
Jan 7, 2026
Merged

Set user session stop timeout in all templates #629

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion archlinux/PKGBUILD.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ package_qubes-vm-core() {
cd "${_pkgnvr}"

# shellcheck disable=SC2154
make -C boot DESTDIR="$pkgdir" install
make -C boot DESTDIR="$pkgdir" SYSTEM_DROPIN_DIR=/usr/lib/systemd/system install
make install-corevm DESTDIR="$pkgdir" SBINDIR=/usr/bin LIBDIR=/usr/lib SYSLIBDIR=/usr/lib SYSTEM_DROPIN_DIR=/usr/lib/systemd/system USER_DROPIN_DIR=/usr/lib/systemd/user DIST=archlinux
make -C app-menu install DESTDIR="$pkgdir" install LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
make -C misc install DESTDIR="$pkgdir" install LIBDIR=/usr/lib SYSLIBDIR=/usr/lib
Expand Down
3 changes: 3 additions & 0 deletions boot/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
LIBDIR ?= /usr/lib
SYSTEM_DROPIN_DIR ?= /lib/systemd/system
SYSCONFDIR ?= /etc
GRUBCONFDIR ?= $(SYSCONFDIR)/default
DRACUTCONFDIR ?= $(LIBDIR)/dracut/dracut.conf.d
Expand All @@ -7,5 +8,7 @@ GRUBCFGNAME ?= grub.qubes
.PHONY: install

install:
install -D -m 0644 session-stop-timeout.conf \
$(DESTDIR)$(SYSTEM_DROPIN_DIR)/user@.service.d/90-session-stop-timeout.conf
install -D -m 0644 grub.qubes $(DESTDIR)$(GRUBCONFDIR)/$(GRUBCFGNAME)
install -D -m 0644 dracut-qubes.conf $(DESTDIR)$(DRACUTCONFDIR)/30-qubes.conf
2 changes: 0 additions & 2 deletions boot/redhat/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,5 @@ QUBESDATADIR = $(DATADIR)/qubes
.PHONY: install

install:
install -D -m 0644 session-stop-timeout.conf \
$(DESTDIR)$(LIBDIR)/systemd/system/user@.service.d/90-session-stop-timeout.conf
install -D -m 0644 serial.conf $(DESTDIR)$(QUBESDATADIR)/serial.conf
install -D qubes-serial-login $(DESTDIR)$(BINDIR)/qubes-serial-login
2 changes: 0 additions & 2 deletions boot/redhat/session-stop-timeout.conf
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions boot/session-stop-timeout.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[Service]
TimeoutStopSec=5s
1 change: 1 addition & 0 deletions debian/qubes-core-agent.install
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ lib/systemd/system/systemd-timesyncd.service.d/30_qubes.conf
lib/systemd/system/systemd-logind.service.d/30_qubes.conf
lib/systemd/system/systemd-nsresourced.service.d/30_qubes.conf
lib/systemd/system/systemd-nsresourced.socket.d/30_qubes.conf
lib/systemd/system/user@.service.d/90-session-stop-timeout.conf
lib/systemd/resolved.conf.d/30_resolved-no-mdns-or-llmnr.conf
lib/systemd/system/home.mount
lib/systemd/system/usr-local.mount
Expand Down
2 changes: 1 addition & 1 deletion rpm_spec/core-agent.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ export ETCSECURITYDIR=/usr/etc/security

make install-vm PYTHON=%{__python3} "DESTDIR=$RPM_BUILD_ROOT" SYSTEM_DROPIN_DIR=%{_unitdir} SYSLIBDIR=/usr/lib ENABLE_SELINUX=%with_selinux
make -C app-menu DESTDIR=$RPM_BUILD_ROOT install
make -C boot DESTDIR=$RPM_BUILD_ROOT install
make -C boot DESTDIR=$RPM_BUILD_ROOT SYSTEM_DROPIN_DIR=%{_unitdir} install
make -C boot/redhat DESTDIR=$RPM_BUILD_ROOT install
make -C config-overrides DESTDIR=$RPM_BUILD_ROOT install
make -C filesystem DESTDIR=$RPM_BUILD_ROOT install
Expand Down