Start wpasupplicant when needed in installer stage2 (mga#32125)HEADmaster

1 files changed, 9 insertions, 2 deletions

diff --git a/lib/network/connection/wireless.pm b/lib/network/connection/wireless.pm
index 9b58970..547f79c 100644
--- a/lib/network/connection/wireless.pm
+++ b/lib/network/connection/wireless.pm
@@ -731,8 +731,15 @@ sub add_network_to_wpa_supplicant {
     } else {
         wpa_supplicant_add_network($self->{access}{network});
     }
+    if ($::isInstall) {
+        my $interface = $self->get_interface;
+        if (!run_program::rooted($::prefix, "/usr/sbin/wpa_cli -i $interface status")) {
+            run_program::rooted($::prefix, "/usr/sbin/wpa_supplicant -B -i $interface -c /etc/wpa_supplicant.conf -D nl80211,wext");
+            return;
+        }
+    }
     #- this should be handled by the monitoring daemon instead
-    run_program::run('/usr/sbin/wpa_cli', 'reconfigure');
+    run_program::rooted($::prefix, "/usr/sbin/wpa_cli", 'reconfigure');
 }
 
 sub write_settings {
@@ -786,7 +793,7 @@ sub connect {
                 eval { $net->{monitor}->select_network($network_id) };
                 return !$@;
             } else {
-                run_program::run('/usr/sbin/wpa_cli', 'select_network', $network_id);
+                run_program::rooted($::prefix, "/usr/sbin/wpa_cli", 'select_network', $network_id);
             }
         }
     }