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

Merge branch 'hvm' of 10.141.1.101:/var/lib/qubes/git/marmarek/core into hvm

Browse Source
This commit is contained in:
Joanna Rutkowska 2012-08-24 15:12:07 +02:00
commit 62b4a7e9d8
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
qubes_rpc/qubes.Filecopy.policy
View File

@ -3,4 +3,4 @@
## Please use a single # to start your custom comments ## Please use a single # to start your custom comments
$anyvm $anyvm ask,user=root $anyvm $anyvm ask

2
qubes_rpc/qubes.GetAppmenus
View File

@ -1,2 +1,2 @@
shopt -s nullglob shopt -s nullglob
/bin/grep -H = /usr/share/applications/*.desktop /usr/local/share/applications/*.desktop 2> /dev/null awk '/^\[/ { if (tolower($0) != "\[desktop entry\]") nextfile } /=/ {print FILENAME ":" $0 }' /usr/share/applications/*.desktop /usr/local/share/applications/*.desktop 2> /dev/null

2
rpm_spec/core-vm.spec
View File

@ -398,7 +398,7 @@ rm -rf $RPM_BUILD_ROOT
/usr/lib/qubes/meminfo-writer /usr/lib/qubes/meminfo-writer
/usr/lib/qubes/network-manager-prepare-conf-dir /usr/lib/qubes/network-manager-prepare-conf-dir
/usr/lib/qubes/qfile-agent /usr/lib/qubes/qfile-agent
/usr/lib/qubes/qfile-unpacker %attr(4755,root,root) /usr/lib/qubes/qfile-unpacker
/usr/lib/qubes/qopen-in-vm /usr/lib/qubes/qopen-in-vm
/usr/lib/qubes/qrexec_agent /usr/lib/qubes/qrexec_agent
/usr/lib/qubes/qrexec_client_vm /usr/lib/qubes/qrexec_client_vm

2
version_vm
View File

@ -1 +1 @@
1.7.42 1.7.43