diff options
-rw-r--r-- | perl-install/network/netconnect.pm | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 550d8f622..4b10a4cf9 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -330,13 +330,20 @@ sub real_main { ]; }, post => sub { - unless ($cable_no_auth->()) { - substInFile { - s/username\s+.*\n/username $netcnx->{login}\n/; - s/password\s+.*\n/password $netcnx->{passwd}\n/; - } "$::prefix/etc/bpalogin.conf"; + if ($cable_no_auth->()) { + if (-f "$::prefix/etc/rc.d/init.d/bpalogin") { + require services; + services::stop("bpalogin"); + services::do_not_start_service_on_boot("bpalogin"); + } + } else { if ($in->do_pkgs->install("bpalogin")) { + substInFile { + s/username\s+.*\n/username $netcnx->{login}\n/; + s/password\s+.*\n/password $netcnx->{passwd}\n/; + } "$::prefix/etc/bpalogin.conf"; require services; + services::start_service_on_boot("bpalogin"); services::restart("bpalogin"); } } |