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

rpm: fix policy/qubes.SyncAppMenus name

Browse Source
This commit is contained in:
Marek Marczykowski-Górecki 2013-10-23 00:25:50 +02:00
parent f2d5d41c06
commit de087e9b8d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qrexec/qrexec-daemon.c
View File

@ -147,6 +147,8 @@ void init(int xid)
case 0: case 0:
break; break;
default: default:
if (getenv("QREXEC_STARTUP_NOWAIT"))
exit(0);
fprintf(stderr, "Waiting for VM's qrexec agent."); fprintf(stderr, "Waiting for VM's qrexec agent.");
for (i=0;i<startup_timeout;i++) { for (i=0;i<startup_timeout;i++) {
sleep(1); sleep(1);

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

@ -85,7 +85,7 @@ install -D appmenus-scripts/qvm-sync-appmenus $RPM_BUILD_ROOT/usr/bin/qvm-sync-a
mkdir -p $RPM_BUILD_ROOT/etc/qubes-rpc/policy mkdir -p $RPM_BUILD_ROOT/etc/qubes-rpc/policy
cp appmenus-scripts/qubes.SyncAppMenus $RPM_BUILD_ROOT/etc/qubes-rpc/ cp appmenus-scripts/qubes.SyncAppMenus $RPM_BUILD_ROOT/etc/qubes-rpc/
cp appmenus-scripts/qubes.SyncAppMenus.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/ cp appmenus-scripts/qubes.SyncAppMenus.policy $RPM_BUILD_ROOT/etc/qubes-rpc/policy/qubes.SyncAppMenus
mkdir -p $RPM_BUILD_ROOT/usr/share/qubes-appmenus/ mkdir -p $RPM_BUILD_ROOT/usr/share/qubes-appmenus/
cp appmenus-files/* $RPM_BUILD_ROOT/usr/share/qubes-appmenus/ cp appmenus-files/* $RPM_BUILD_ROOT/usr/share/qubes-appmenus/
@ -185,7 +185,7 @@ sed -i 's/^UseNetworkHeuristic=.*/UseNetworkHeuristic=false/' /etc/PackageKit/Pa
mv -f /lib/udev/rules.d/69-xorg-vmmouse.rules /var/lib/qubes/removed-udev-scripts/ 2> /dev/null || : mv -f /lib/udev/rules.d/69-xorg-vmmouse.rules /var/lib/qubes/removed-udev-scripts/ 2> /dev/null || :
%files %files
/etc/qubes-rpc/policy/qubes.SyncAppMenus.policy /etc/qubes-rpc/policy/qubes.SyncAppMenus
/etc/qubes-rpc/qubes.SyncAppMenus /etc/qubes-rpc/qubes.SyncAppMenus
%{python_sitearch}/qubes/modules/10appmenus.py %{python_sitearch}/qubes/modules/10appmenus.py
%{python_sitearch}/qubes/modules/10appmenus.pyc %{python_sitearch}/qubes/modules/10appmenus.pyc