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

Move main qrexec binaries to /usr/s?bin

Browse Source 
/usr/lib/* is a place only for some auxiliary binaries. While in
majority cases, qrexec-client and qrexec-daemon are called from some
other scripts, it is valid to call them directly too.
This commit is contained in:
Marek Marczykowski-Górecki 2017-05-17 14:30:30 +02:00
parent 1502eb4d59
commit ea6f47bf33
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
rpm_spec/core-dom0-linux.spec
View File

@ -108,11 +108,12 @@ install -m 0664 -D dom0-updates/qubes.ReceiveUpdates.policy $RPM_BUILD_ROOT/etc/
install -d $RPM_BUILD_ROOT/var/lib/qubes/updates install -d $RPM_BUILD_ROOT/var/lib/qubes/updates
# Qrexec # Qrexec
mkdir -p $RPM_BUILD_ROOT/usr/lib/qubes/ mkdir -p $RPM_BUILD_ROOT/usr/bin $RPM_BUILD_ROOT/usr/sbin
cp qrexec/qrexec-daemon $RPM_BUILD_ROOT/usr/lib/qubes/ install qrexec/qrexec-daemon $RPM_BUILD_ROOT/usr/sbin/
cp qrexec/qrexec-client $RPM_BUILD_ROOT/usr/lib/qubes/ install qrexec/qrexec-client $RPM_BUILD_ROOT/usr/bin/
# XXX: Backward compatibility # XXX: Backward compatibility
ln -s qrexec-client $RPM_BUILD_ROOT/usr/lib/qubes/qrexec_client ln -s ../../bin/qrexec-client $RPM_BUILD_ROOT/usr/lib/qubes/qrexec-client
ln -s ../../sbin/qrexec-daemon $RPM_BUILD_ROOT/usr/lib/qubes/qrexec-daemon
cp qrexec/qubes-rpc-multiplexer $RPM_BUILD_ROOT/usr/lib/qubes cp qrexec/qubes-rpc-multiplexer $RPM_BUILD_ROOT/usr/lib/qubes
### pm-utils ### pm-utils
@ -245,10 +246,12 @@ chmod -x /etc/grub.d/10_linux
%dir %{_dracutmoddir}/90extra-modules %dir %{_dracutmoddir}/90extra-modules
%{_dracutmoddir}/90extra-modules/* %{_dracutmoddir}/90extra-modules/*
# Qrexec # Qrexec
%attr(4750,root,qubes) /usr/lib/qubes/qrexec-daemon /usr/sbin/qrexec-daemon
/usr/lib/qubes/qrexec-client /usr/bin/qrexec-client
/usr/lib/qubes/qrexec_client
/usr/lib/qubes/qubes-rpc-multiplexer /usr/lib/qubes/qubes-rpc-multiplexer
# compat symlinks
/usr/lib/qubes/qrexec-client
/usr/lib/qubes/qrexec-daemon
# file copy # file copy
/usr/bin/qvm-copy-to-vm /usr/bin/qvm-copy-to-vm
/usr/bin/qvm-move-to-vm /usr/bin/qvm-move-to-vm