Merge branch 'prebeta2' of git.qubes-os.org:/var/lib/qubes/git/rafal/core

This commit is contained in:
Joanna Rutkowska 2011-07-24 17:20:33 +02:00
commit 494de864f1
3 changed files with 14 additions and 4 deletions

View File

@ -1 +1,6 @@
anyvm anyvm ask,user=root ## Note that policy parsing stops at the first match,
## so adding anything below "$anyvm $anyvm action" line will have no effect
## Please use a single # to start your custom comments
$anyvm $anyvm ask,user=root

View File

@ -1,2 +1,7 @@
anyvm dispvm allow ## Note that policy parsing stops at the first match,
anyvm anyvm ask ## so adding anything below "$anyvm $anyvm action" line will have no effect
## Please use a single # to start your custom comments
$anyvm $dispvm allow
$anyvm $anyvm ask

View File

@ -25,4 +25,4 @@ if ! [ $# = 1 ] ; then
exit 1 exit 1
fi fi
exec /usr/lib/qubes/qrexec_client_vm dispvm qubes.OpenInVM "/usr/lib/qubes/qopen-in-vm" "$1" exec /usr/lib/qubes/qrexec_client_vm '$dispvm' qubes.OpenInVM "/usr/lib/qubes/qopen-in-vm" "$1"