QubesOS/qubes-installer-qubes-os
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

firstboot: use qvm-pci --add-class net for NetVM setup

Browse Source 
Trying to reduce code duplication.
This commit is contained in:
Marek Marczykowski-Górecki 2015-11-23 19:09:53 +01:00
parent 3c25ca1d94
commit cdd4294938
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 1 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
firstboot/modules/qubes_setup.py
View File

@ -258,34 +258,10 @@ class moduleClass(Module):
subprocess.call(['qvm-kill', '{}-dvm'.format(self.default_template)]) subprocess.call(['qvm-kill', '{}-dvm'.format(self.default_template)])
raise raise
def find_net_devices(self):
p = subprocess.Popen (["/sbin/lspci", "-mm", "-n"], stdout=subprocess.PIPE)
result = p.communicate()
retcode = p.returncode
if retcode != 0:
print "ERROR when executing lspci!"
raise IOError
net_devices = set()
rx_netdev = re.compile (r"^([0-9][0-9]:[0-9][0-9].[0-9]) \"02")
for dev in str(result[0]).splitlines():
match = rx_netdev.match (dev)
if match is not None:
dev_bdf = match.group(1)
assert dev_bdf is not None
net_devices.add (dev_bdf)
return net_devices
def do_configure_network(self): def do_configure_network(self):
self.run_command(['/usr/bin/qvm-prefs', '--force-root', '--set', 'sys-firewall', 'netvm', 'sys-net']) self.run_command(['/usr/bin/qvm-prefs', '--force-root', '--set', 'sys-firewall', 'netvm', 'sys-net'])
self.run_command(['/usr/bin/qubes-prefs', '--set', 'default-netvm', 'sys-firewall']) self.run_command(['/usr/bin/qubes-prefs', '--set', 'default-netvm', 'sys-firewall'])
self.run_command(['/usr/bin/qvm-pci', '--add-class', 'sys-net', 'net'])
for dev in self.find_net_devices():
self.run_command(['/usr/bin/qvm-pci', '-a', 'sys-net', dev])
self.run_command(['/usr/sbin/service', 'qubes-netvm', 'start']) self.run_command(['/usr/sbin/service', 'qubes-netvm', 'start'])
def do_configure_template(self, template): def do_configure_template(self, template):