Move the proxy propose before software proposal is done

agama-project · Aug 24, 2023 · b1ce499 · b1ce499
1 parent 527b531
commit b1ce499
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/service/lib/agama/manager.rb b/service/lib/agama/manager.rb
@@ -93,13 +93,12 @@ def install_phase
 
       progress.step("Partitioning") do
         storage.install
+        proxy.propose
         # propose software after /mnt is already separated, so it uses proper
         # target
         software.propose
       end
 
-      ProxySetup.instance.propose
-
       progress.step("Installing Software") { software.install }
 
       on_target do
@@ -125,6 +124,13 @@ def software
       end
     end
 
+    # ProxySetup instance
+    #
+    # @return [ProxySetup]
+    def proxy
+      ProxySetup.instance
+    end
+
     # Language manager
     #
     # @return [DBus::Clients::Locale]

diff --git a/service/lib/agama/proxy_setup.rb b/service/lib/agama/proxy_setup.rb
@@ -58,7 +58,7 @@ def run
     end
 
     def propose
-      on_target { add_packages } if Proxy.enabled
+      add_packages if Proxy.enabled
     end
 
     def install