Fixes nonpersistence of Qubes RPC policy file. Closes #27.

Author: Vít Šesták

README.md

@@ -4,7 +4,7 @@
 
 Currently, it is public preview. It contains scripts that can:
 
-* Install the backup storage VM (see install-backup-storage-vm). Currently, it is needed to install it after every reboot of the BackupStorageVM, because policy file in /etc/qubes-rpc/ does not survive reboot.
+* Install the backup storage VM (see install-backup-storage-vm).
 * Run the backup from dom0 (see backup).
 
 You might notice that DVM is also involved in the backup process, but no installation script is there. That's OK: All scripts needed in the DVM are uploaded automatically after DVM creation.

backupbackends/duplicity.py

@@ -67,7 +67,9 @@ def install_dom0(self, vm):
 		subprocess.check_call("echo "+shlex.quote("$anyvm  "+vm.get_name()+" allow")+" | sudo tee /etc/qubes-rpc/policy/v6ak.QubesInterVmBackupStorage", shell=True, stdout=subprocess.DEVNULL)
 
 	def install_backup_storage_vm(self, vm):
-		# TODO: make it persistent across reboots
+		vm.check_call("sudo mkdir -p /rw/config/qubes-bind-dirs.d")
+		vm.check_call("echo \"touch /etc/qubes-rpc/v6ak.QubesInterVmBackupStorage; binds+=( '/etc/qubes-rpc/v6ak.QubesInterVmBackupStorage' )\" | sudo tee /rw/config/qubes-bind-dirs.d/10_vm-qubes-backup-poc.conf")
+		vm.shutdown() # In order to apply binds
 		vm.check_call("sudo mkdir -p /usr/local/share/v6-qubes-backup-poc/")
 		vm.check_call("echo /usr/local/share/v6-qubes-backup-poc/v6-qubes-backup-poc.py | sudo tee /etc/qubes-rpc/v6ak.QubesInterVmBackupStorage")
 		with open(self.base_path+"backup-storage-agent/v6-qubes-backup-poc.py") as inp:

qubesvmtools.py

@@ -81,6 +81,8 @@ def check_call(self, command, stdin = None, input = None, stdout = DEVNULL, stde
 			ret = proc.wait()
 			if ret != 0:
 				raise subprocess.CalledProcessError(ret, command_native)
+	def shutdown(self):
+		subprocess.check_call(["qvm-shutdown", "--wait", self.name])
 
 class DvmInstance(VmInstance):
 	def __init__(self, name):