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

Merge branch 'master' of git.qubes-os.org:/var/lib/qubes/git/marmarek/core

Browse Source
This commit is contained in:
Joanna Rutkowska 2011-03-15 18:16:33 +01:00
commit 5e1a808648
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -561,7 +561,7 @@ class QubesVm(object):
qvm_collection.unlock_db() qvm_collection.unlock_db()
if verbose: if verbose:
print "--> Updating FirewallVMs rules..." print "--> Updating firewall rules..."
for vm in qvm_collection.values(): for vm in qvm_collection.values():
if vm.is_proxyvm(): if vm.is_proxyvm():
vm.write_iptables_xenstore_entry() vm.write_iptables_xenstore_entry()
@ -1116,7 +1116,7 @@ class QubesProxyVm(QubesNetVm):
def start(self, debug_console = False, verbose = False, preparing_dvm = False): def start(self, debug_console = False, verbose = False, preparing_dvm = False):
if dry_run: if dry_run:
return return
retcode = super(QubesFirewallVm, self).start(debug_console=debug_console, verbose=verbose, preparing_dvm=preparing_dvm) retcode = super(QubesProxyVm, self).start(debug_console=debug_console, verbose=verbose, preparing_dvm=preparing_dvm)
self.netvm_vm.add_external_ip_permission(self.get_xid()) self.netvm_vm.add_external_ip_permission(self.get_xid())
self.write_netvm_domid_entry() self.write_netvm_domid_entry()
return retcode return retcode
@ -1125,7 +1125,7 @@ class QubesProxyVm(QubesNetVm):
if dry_run: if dry_run:
return return
self.netvm_vm.remove_external_ip_permission(self.get_xid()) self.netvm_vm.remove_external_ip_permission(self.get_xid())
super(QubesFirewallVm, self).force_shutdown() super(QubesProxyVm, self).force_shutdown()
def create_xenstore_entries(self, xid): def create_xenstore_entries(self, xid):
if dry_run: if dry_run: