summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2005-02-04 18:09:47 +0000
committerOlivier Blin <oblin@mandriva.org>2005-02-04 18:09:47 +0000
commit6706096e43ea89bcd0731d201e6bb55730fe2ba5 (patch)
tree01ca428bfbb33cd3f673a3c2a59bb1c5662677f7
parent552246b0cb1818dd01a096a92453fc9ea1904a76 (diff)
downloaddrakx-6706096e43ea89bcd0731d201e6bb55730fe2ba5.tar
drakx-6706096e43ea89bcd0731d201e6bb55730fe2ba5.tar.gz
drakx-6706096e43ea89bcd0731d201e6bb55730fe2ba5.tar.bz2
drakx-6706096e43ea89bcd0731d201e6bb55730fe2ba5.tar.xz
drakx-6706096e43ea89bcd0731d201e6bb55730fe2ba5.zip
handle bpalogin service
-rw-r--r--perl-install/network/netconnect.pm17
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");
}
}