Skip to content

Commit

Permalink
qubes.WaitForSession: refactor by waiting for qrexec-fork-server socket
Browse files Browse the repository at this point in the history
  • Loading branch information
fepitre committed Nov 2, 2019
1 parent 8c86664 commit 9b1eab9
Showing 1 changed file with 4 additions and 14 deletions.
18 changes: 4 additions & 14 deletions qubes-rpc/qubes.WaitForSession
Original file line number Diff line number Diff line change
@@ -1,16 +1,6 @@
#!/bin/sh

# old API - get the user from caller
#read -r IGNORE_USERNAME

# use default user provided in QubesDB, or hardcoded 'user' - this must be the
# same as the X session owner
USERNAME=$(qubesdb-read /default-user || echo 'user')
cmd='echo $$ >> /tmp/qubes-session-waiter; [ ! -f /tmp/qubes-session-env ] && exec sleep inf'
if [ "$(id -un)" = "$USERNAME" ]; then
sh -c "$cmd" 2>/dev/null
else
su -s /bin/sh -c "$cmd" - "$USERNAME" 2> /dev/null
fi
# the above line is _expected_ to be terminated by a signal, don't treat this as a failure
exit 0
while ! [ -e /var/run/qubes/qrexec-server.user.sock ]
do
sleep 0.1
done

0 comments on commit 9b1eab9

Please sign in to comment.