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

dom0/DispVM: inherit firewall from calling VM (#370)

Browse Source
This commit is contained in:
Marek Marczykowski 2011-10-31 01:28:46 +01:00
parent d3c1a09ca9
commit a4e11dedd9
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom0/qvm-core/qubes.py
View File

@ -1748,6 +1748,7 @@ class QubesDisposableVm(QubesVm):
attrs["dispid"] = str(self.dispid) attrs["dispid"] = str(self.dispid)
attrs["template_qid"] = str(self.template_vm.qid) attrs["template_qid"] = str(self.template_vm.qid)
attrs["label"] = self.label.name attrs["label"] = self.label.name
attrs["firewall_conf"] = self.firewall_conf
return attrs return attrs
def verify_files(self): def verify_files(self):
@ -2389,7 +2390,7 @@ class QubesVmCollection(dict):
kwargs = {} kwargs = {}
attr_list = ("qid", "name", attr_list = ("qid", "name",
"template_qid", "template_qid",
"label", "dispid") "label", "dispid", "firewall_conf" )
for attribute in attr_list: for attribute in attr_list:
kwargs[attribute] = element.get(attribute) kwargs[attribute] = element.get(attribute)

8
dom0/restore/qfile-daemon-dvm
View File

@ -24,6 +24,7 @@ import dbus
import subprocess import subprocess
import sys import sys
import fcntl import fcntl
import shutil
from qubes.qubes import QubesVmCollection from qubes.qubes import QubesVmCollection
from qubes.qubes import QubesException from qubes.qubes import QubesException
@ -79,7 +80,12 @@ class QfileDaemonDvm:
qvm_collection.unlock_db() qvm_collection.unlock_db()
return None return None
dispid=int(disp_name[4:]) dispid=int(disp_name[4:])
qvm_collection.add_new_disposablevm(disp_name, vm_disptempl.template_vm, label=vm.label, dispid=dispid) dispvm=qvm_collection.add_new_disposablevm(disp_name, vm_disptempl.template_vm, label=vm.label, dispid=dispid)
# By default inherit firewall rules from calling VM
if os.path.exists(vm.firewall_conf):
disp_firewall_conf = '/var/run/qubes/%s-firewall.xml' % disp_name
shutil.copy(vm.firewall_conf, disp_firewall_conf)
dispvm.firewall_conf = disp_firewall_conf
qvm_collection.save() qvm_collection.save()
qvm_collection.unlock_db() qvm_collection.unlock_db()
# Reload firewall rules # Reload firewall rules