Skip to content

Wait for session only if necessary #571

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
merged 1 commit into from
Jun 7, 2025
Merged

Wait for session only if necessary #571

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
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 @@ -37,6 +37,7 @@ etc/qubes-rpc/qubes.VMRootShell
etc/qubes-rpc/qubes.VMExec
etc/qubes-rpc/qubes.VMExecGUI
etc/qubes-rpc/qubes.WaitForSession
etc/qubes-rpc/qubes.WaitForRunningSystem
etc/qubes-rpc/qubes.GetDate
etc/qubes-suspend-module-blacklist
etc/qubes/autostart/*
Expand Down
1 change: 1 addition & 0 deletions qubes-rpc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ install:
qubes.SuspendPreAll \
qubes.SuspendPostAll \
qubes.WaitForSession \
qubes.WaitForRunningSystem \
qubes.DetachPciDevice \
qubes.Backup qubes.Restore \
qubes.RegisterBackupLocation \
Expand Down
4 changes: 4 additions & 0 deletions qubes-rpc/qubes.WaitForRunningSystem
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
#!/bin/sh
set -eu
systemctl --wait --quiet is-system-running
exit 0
15 changes: 8 additions & 7 deletions qubes-rpc/qubes.WaitForSession
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
#!/bin/sh

USERNAME="$(qubesdb-read /default-user || echo 'user')"

while ! [ -e "/var/run/qubes/qrexec-server.$USERNAME.sock" ]
do
sleep 0.1
done
set -eu

if test "$(qubesdb-read /qubes-gui-enabled)" = "True"; then
user="$(qubesdb-read /default-user || echo 'user')"
while ! [ -e "/var/run/qubes/qrexec-server.$user.sock" ]; do
sleep 0.1
done
fi

systemctl --user --wait --quiet is-system-running

Expand Down
1 change: 1 addition & 0 deletions rpm_spec/core-agent.spec.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,6 +917,7 @@ rm -f %{name}-%{version}
%config(noreplace) /etc/qubes-rpc/qubes.SuspendPost
%config(noreplace) /etc/qubes-rpc/qubes.SuspendPostAll
%config(noreplace) /etc/qubes-rpc/qubes.WaitForSession
%config(noreplace) /etc/qubes-rpc/qubes.WaitForRunningSystem
%config(noreplace) /etc/qubes-rpc/qubes.DetachPciDevice
%config(noreplace) /etc/qubes-rpc/qubes.Backup
%config(noreplace) /etc/qubes-rpc/qubes.Restore
Expand Down