From bd4044479462649a08687575c579ff3632c6fc39 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.org>
Date: Thu, 18 Aug 2005 14:51:00 +0000
Subject: install bpalogin if needed only

---
 perl-install/network/netconnect.pm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index da095d2c2..2d6ca6b9f 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -316,14 +316,15 @@ sub real_main {
                             { label => N("Account Password"),  val => \$net->{cable}{passwd}, hidden => 1, disabled => $cable_no_auth },
                         ];
                     },
+                    complete => sub {
+                        !$cable_no_auth->() && !$in->do_pkgs->ensure_is_installed('bpalogin', '/usr/sbin/bpalogin');
+                    },
                     post => sub {
-			my $use_bpalogin = !$cable_no_auth->();
-			if ($in->do_pkgs->install("bpalogin")) {
-			    substInFile {
-				s/username\s+.*\n/username $net->{cable}{login}\n/;
-				s/password\s+.*\n/password $net->{cable}{passwd}\n/;
-			    } "$::prefix/etc/bpalogin.conf";
-			}
+                        my $use_bpalogin = !$cable_no_auth->();
+                        $use_bpalogin and substInFile {
+                            s/username\s+.*\n/username $net->{cable}{login}\n/;
+                            s/password\s+.*\n/password $net->{cable}{passwd}\n/;
+                        } "$::prefix/etc/bpalogin.conf";
 			services::set_status("bpalogin", $use_bpalogin);
                         $auto_ip = 1;
                         return "lan";
-- 
cgit v1.2.1