QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

qubes-rpc-multiplexer: deprecate /etc/qubes_rpc, allow /usr/local

Browse Source 
/usr/local resides in private.img, so it is possible to define per-appvm RPC

Also, with the upcoming 3.0 release support for old (R1) paths is
removed.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
This commit is contained in:
Wojtek Porczyk 2015-02-06 19:47:13 +01:00 committed by Marek Marczykowski-Górecki
parent f8d23d0d64
commit c4cf6b646b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qrexec/qubes-rpc-multiplexer
View File

@ -6,23 +6,19 @@ exec 2>/tmp/qrexec-rpc-stderr.$$
rm -f /tmp/qrexec-rpc-stderr.$$ rm -f /tmp/qrexec-rpc-stderr.$$
QUBES_RPC=/etc/qubes-rpc QUBES_RPC=/etc/qubes-rpc
# XXX: Backward compatibility LOCAL_QUBES_RPC=/usr/local/etc/qubes-rpc
DEPRECATED_QUBES_RPC=/etc/qubes_rpc
if ! [ $# = 2 ] ; then if ! [ $# = 2 ] ; then
echo $0: bad argument count, usage: $0 SERVICE-NAME REMOTE-DOMAIN-NAME >&2 echo $0: bad argument count, usage: $0 SERVICE-NAME REMOTE-DOMAIN-NAME >&2
exit 1 exit 1
fi fi
export QREXEC_REMOTE_DOMAIN="$2" export QREXEC_REMOTE_DOMAIN="$2"
if [ -s "$QUBES_RPC/$1" ]; then for CFG_FILE in $QUBES_RPC/"$1" $LOCAL_QUBES_RPC/"$1"; do
CFG_FILE=$QUBES_RPC/"$1" if [ -s "$CFG_FILE" ]; then
elif [ -s "$DEPRECATED_QUBES_RPC/$1" ]; then break
echo "$0: RPC service '$1' uses deprecated directory, please move to $QUBES_RPC" >&2
CFG_FILE=$DEPRECATED_QUBES_RPC/"$1"
else
echo "$0: Cannot find service $1 file in $QUBES_RPC" >&2
exit 1
fi fi
done
if [ -x "$CFG_FILE" ] ; then if [ -x "$CFG_FILE" ] ; then
exec "$CFG_FILE" exec "$CFG_FILE"