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

firstboot: qubes_setup polishing

Browse Source 
* Don't offer an option for netwokring in Dom0
* Set timezone in default tempate
* Enable networking before creating DispVM template
This commit is contained in:
Joanna Rutkowska 2011-04-05 19:14:35 +02:00
parent 8962a846bd
commit 61d25f0872
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
firstboot/modules/qubes_setup.py
View File

@ -38,14 +38,12 @@ class moduleClass(Module):
def __init__(self): def __init__(self):
Module.__init__(self) Module.__init__(self)
self.priority = 10000 self.priority = 10000
self.sidebarTitle = N_("Configure Qubes") self.sidebarTitle = N_("Create Service VMs")
self.title = N_("Configure Qubes") self.title = N_("Create Service VMs")
self.icon = "qubes.png" self.icon = "qubes.png"
def apply(self, interface, testing=False): def apply(self, interface, testing=False):
try: try:
self.netvm_radio.set_sensitive(False)
self.dom0_radio.set_sensitive(False)
if self.progress is None: if self.progress is None:
self.progress = gtk.ProgressBar() self.progress = gtk.ProgressBar()
self.progress.set_pulse_step(0.06) self.progress.set_pulse_step(0.06)
@ -57,7 +55,8 @@ class moduleClass(Module):
self.create_default_netvm() self.create_default_netvm()
self.create_default_fwvm() self.create_default_fwvm()
self.set_networking_type(self.netvm_radio.get_active()) self.set_networking_type(netvm=True)
self.start_qubes_networking()
self.configure_template() self.configure_template()
self.create_default_dvm() self.create_default_dvm()
@ -77,10 +76,8 @@ class moduleClass(Module):
self.progress.set_text(stage) self.progress.set_text(stage)
def configure_template(self): def configure_template(self):
self.show_stage(_("Creating default NetworkVM")) self.show_stage(_("Configuring default Temaple"))
# copy /etc/localtime to template self.run_in_thread(self.do_configure_template)
# ...
# stop template
def run_in_thread(self, method): def run_in_thread(self, method):
thread = threading.Thread(target=method) thread = threading.Thread(target=method)
@ -114,6 +111,10 @@ class moduleClass(Module):
self.show_stage(_("Setting Dom0 networking")) self.show_stage(_("Setting Dom0 networking"))
self.run_in_thread(self.do_set_dom0_networking) self.run_in_thread(self.do_set_dom0_networking)
def start_qubes_networking (self):
self.show_stage(_("Starting Qubes networkig"))
self.run_in_thread(self.do_start_networking)
def run_command(self, command): def run_command(self, command):
try: try:
os.setgid(self.qubes_gid) os.setgid(self.qubes_gid)
@ -143,28 +144,31 @@ class moduleClass(Module):
def do_set_dom0_networking(self): def do_set_dom0_networking(self):
self.run_command(['/usr/bin/qvm-set-default-netvm', 'dom0']) self.run_command(['/usr/bin/qvm-set-default-netvm', 'dom0'])
def do_start_networking(self):
subprocess.check_call(['/etc/init.d/qubes_netvm', 'start'])
def do_configure_template(self):
subprocess.check_call(['/bin/mkdir', '/mnt/template-root'])
subprocess.check_call(['/bin/mount', '-oloop',
'/var/lib/qubes/vm-templates/fedora-14-x64/root.img',
'/mnt/template-root'])
# Copy timezone setting from Dom0 to template
subprocess.check_call(['cp', '/etc/localtime', '/mnt/template-root/etc'])
subprocess.check_call(['/bin/umount', '/mnt/template-root'])
def createScreen(self): def createScreen(self):
self.vbox = gtk.VBox(spacing=5) self.vbox = gtk.VBox(spacing=5)
label = gtk.Label(_("Now we will configure your Qubes OS system. " label = gtk.Label(_("Almost there! We just need to create a few service VMs."
"This will take a few minutes, as I need to create and configure " "This will take a few minutes...\n\n"))
"some default virtual machines for you to use.\n\n"
"But first select the networking type you wish to have."))
label.set_line_wrap(True) label.set_line_wrap(True)
label.set_alignment(0.0, 0.5) label.set_alignment(0.0, 0.5)
label.set_size_request(500, -1) label.set_size_request(500, -1)
self.vbox.pack_start(label, False, True, padding=20) self.vbox.pack_start(label, False, True, padding=20)
self.netvm_radio = gtk.RadioButton(None, _("_NetVM networking"))
self.vbox.pack_start(self.netvm_radio, False, True)
self.dom0_radio = gtk.RadioButton(self.netvm_radio, _("_Dom0 networking (not recommended)"))
self.vbox.pack_start(self.dom0_radio, False, True)
self.progress = None self.progress = None
def initializeUI(self): def initializeUI(self):
self.netvm_radio.set_active(True)
self.qubes_gid = grp.getgrnam('qubes').gr_gid self.qubes_gid = grp.getgrnam('qubes').gr_gid
self.stage = "Initialization" self.stage = "Initialization"
self.process_error = None self.process_error = None