autostart anon-connection-wizard instead of tor-control-panel

troubadoour · Aug 19, 2018 · 88d4970 · 88d4970
1 parent 718fbd0
commit 88d4970
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/usr/lib/python3/dist-packages/whonix_setup_wizard/whonix_setup_wizard.py b/usr/lib/python3/dist-packages/whonix_setup_wizard/whonix_setup_wizard.py
@@ -75,11 +75,8 @@ class Common:
             Therefore, it is reasonable to move the import here to prevent
             missing dependency that happpen when import anon_connection_wizard in whonix-ws.
             '''
-            #from anon_connection_wizard import anon_connection_wizard
-            #anon_connection_wizard = anon_connection_wizard.main()
-
-            from tor_control_panel import tor_control_panel
-            tor_control_panel = tor_control_panel.main()
+            from anon_connection_wizard import anon_connection_wizard
+            anon_connection_wizard = anon_connection_wizard.main()
 
             wizard_steps = []
             if(first_use_notice):

diff --git a/usr/lib/whonix-setup-wizard/whonixsetup_check_for_start b/usr/lib/whonix-setup-wizard/whonixsetup_check_for_start
@@ -54,7 +54,7 @@ if os.path.exists('/usr/share/anon-gw-base-files/gateway'):
     ## What if whonix-setup-wizard is installed but anon-connection-wizard not? Well, in that
     ## case the user should be knowing what the user is doing. Happens only in cases where
     ## the user does not use Whonix's default anon-meta-packages. In that case just error out.
-    from tor_control_panel import tor_status
+    from anon_connection_wizard import tor_status
     tor_status = tor_status.tor_status()
 
     if tor_status == 'tor_enabled':