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