From b1ce499c810df873a5ef2f040cf5150e458530c2 Mon Sep 17 00:00:00 2001
From: Knut Anderssen <kanderssen@suse.com>
Date: Thu, 24 Aug 2023 10:25:08 +0100
Subject: [PATCH] Move the proxy propose before software proposal is done

---
 service/lib/agama/manager.rb     | 10 ++++++++--
 service/lib/agama/proxy_setup.rb |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/service/lib/agama/manager.rb b/service/lib/agama/manager.rb
index c6bb561e1b..3212d1e908 100644
--- 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
index 46704f47b1..4b7e72d993 100644
--- 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