From 3a875edf58e92488affe70dc68a276cc7c10cbf3 Mon Sep 17 00:00:00 2001 From: Marek Marczykowski Date: Fri, 19 Oct 2012 02:05:46 +0200 Subject: [PATCH] dom0/core: fix qubes-dom0-network-via-netvm (#660) IP 10.137.0.1 was already used by netvm, so change dom0 IP to 10.137.0.2. --- dom0/qvm-core/qubes.py | 2 +- dom0/qvm-tools/qubes-dom0-network-via-netvm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dom0/qvm-core/qubes.py b/dom0/qvm-core/qubes.py index cc65e641..a934b0e7 100755 --- a/dom0/qvm-core/qubes.py +++ b/dom0/qvm-core/qubes.py @@ -2140,7 +2140,7 @@ class QubesDom0NetVm(QubesNetVm): @property def ip(self): - return "10.137.0.1" + return "10.137.0.2" def start(self, **kwargs): raise QubesException ("Cannot start Dom0 fake domain!") diff --git a/dom0/qvm-tools/qubes-dom0-network-via-netvm b/dom0/qvm-tools/qubes-dom0-network-via-netvm index a2b13623..ab4eb456 100755 --- a/dom0/qvm-tools/qubes-dom0-network-via-netvm +++ b/dom0/qvm-tools/qubes-dom0-network-via-netvm @@ -55,7 +55,7 @@ def bringup_eth0(netvm): resolv_conf.write('nameserver ' + netvm.gateway + '\n') resolv_conf.write('nameserver ' + netvm.secondary_dns + '\n') resolv_conf.close() - return os.system('ifconfig eth0 10.137.0.1 netmask 255.255.255.255 && route add default dev eth0') == 0 + return os.system('ifconfig eth0 10.137.0.2 netmask 255.255.255.255 && route add default dev eth0') == 0 def netup(): netvm = get_netvm()