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

qubes-anaconda-addon: adjust option for routing updates through tor

Browse Source 
Previously the option was described "Route applications traffic and
updates through Tor anonymity network". This isn't fully accurate
description, and also we decided it's better to provide an option for
routing just updates, not everything.
Also, remove 'experimental' tag.

Fixes QubesOS/qubes-issues#2604
This commit is contained in:
Marek Marczykowski-Górecki 2017-10-07 03:47:17 +02:00
parent c834daa176
commit c9c3d3896b
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
qubes-anaconda-addon/org_qubes_os_initial_setup/gui/spokes/qubes_os.py
View File

@ -255,10 +255,10 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
else:
self.choice_whonix = DisabledChoice(_("Whonix not installed"))
self.choice_whonix_default = QubesChoice(
_('Route applications traffic and updates through Tor anonymity '
'network [experimental]'),
(),
self.choice_whonix_updates = QubesChoice(
_('Enable system and template updates over the Tor anonymity '
'network using Whonix'),
('qvm.updates-via-whonix',),
depend=self.choice_whonix,
indent=True)
@ -545,12 +545,13 @@ class QubesOsSpoke(FirstbootOnlySpokeMixIn, NormalSpoke):
self.set_stage('Setting up networking')
default_netvm = 'sys-firewall'
if self.choice_whonix_default.get_selected():
default_netvm = 'sys-whonix'
updatevm = default_netvm
if self.choice_whonix_updates.get_selected():
updatevm = 'sys-whonix'
self.run_command(['/usr/bin/qvm-prefs', 'sys-firewall', 'netvm', 'sys-net'])
self.run_command(['/usr/bin/qubes-prefs', 'default-netvm', default_netvm])
self.run_command(['/usr/bin/qubes-prefs', 'updatevm', default_netvm])
self.run_command(['/usr/bin/qubes-prefs', 'updatevm', updatevm])
self.run_command(['/usr/bin/qubes-prefs', 'clockvm', 'sys-net'])
self.run_command(['/usr/bin/qvm-start', default_netvm])