From 0ea16ef21b768e4484716e7195021ae09277d5bb Mon Sep 17 00:00:00 2001
From: Marek Marczykowski <marmarek@invisiblethingslab.com>
Date: Sat, 18 Aug 2012 21:17:07 +0200
Subject: [PATCH] dom0+vm/qfile-copy: use setuid instead of policy setting to
 allow chroot

This will allow to not hardcode "root" username in policy, which can be useful
for non-Linux systems.
---
 qubes_rpc/qubes.Filecopy.policy | 2 +-
 rpm_spec/core-vm.spec           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/qubes_rpc/qubes.Filecopy.policy b/qubes_rpc/qubes.Filecopy.policy
index 0a0d735..e0bef3e 100644
--- a/qubes_rpc/qubes.Filecopy.policy
+++ b/qubes_rpc/qubes.Filecopy.policy
@@ -3,4 +3,4 @@
 
 ## Please use a single # to start your custom comments
 
-$anyvm	$anyvm	ask,user=root
+$anyvm	$anyvm	ask
diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index f9ba774..6c84ae0 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -398,7 +398,7 @@ rm -rf $RPM_BUILD_ROOT
 /usr/lib/qubes/meminfo-writer
 /usr/lib/qubes/network-manager-prepare-conf-dir
 /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/qrexec_agent
 /usr/lib/qubes/qrexec_client_vm