Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes.WaitForSession: refactor by waiting for qrexec-fork-server socket

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-11-02 18:55:01 +01:00
parent 8c8666451e
commit a44e73900e
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 5 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
qubes-rpc/qubes.WaitForSession
View File

@ -1,16 +1,8 @@
#!/bin/sh
# old API - get the user from caller
#read -r IGNORE_USERNAME
USERNAME="$(qubesdb-read /default-user || echo 'user')"
# 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.$USERNAME.sock" ]
do
sleep 0.1
done