summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.org>2004-09-16 04:23:38 +0000
committerOlivier Blin <oblin@mandriva.org>2004-09-16 04:23:38 +0000
commitb0725b3ca55a71ff8d14cb10515d438cb45e83fc (patch)
treebc5f3ec951e2872f5b540719296452f31719964e /perl-install
parentb1628589377879b66b1671439df6dc5d54d058c2 (diff)
downloaddrakx-backup-do-not-use-b0725b3ca55a71ff8d14cb10515d438cb45e83fc.tar
drakx-backup-do-not-use-b0725b3ca55a71ff8d14cb10515d438cb45e83fc.tar.gz
drakx-backup-do-not-use-b0725b3ca55a71ff8d14cb10515d438cb45e83fc.tar.bz2
drakx-backup-do-not-use-b0725b3ca55a71ff8d14cb10515d438cb45e83fc.tar.xz
drakx-backup-do-not-use-b0725b3ca55a71ff8d14cb10515d438cb45e83fc.zip
stop capi service before new config is written so that capiinit can unload the old driver
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/adsl.pm2
-rw-r--r--perl-install/network/isdn.pm5
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index 3c74ff532..c840cccb2 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -368,7 +368,7 @@ METRIC=$metric
services::stop("isdn4linux");
services::do_not_start_service_on_boot("isdn4linux");
services::start_service_on_boot("capi4linux");
- services::restart("capi4linux");
+ services::start("capi4linux");
#- install and run drdsl for dsl connections, once capi driver is loaded
$in->do_pkgs->ensure_is_installed_if_available("drdsl", "/usr/sbin/drdsl");
diff --git a/perl-install/network/isdn.pm b/perl-install/network/isdn.pm
index 084ec5370..e91810aba 100644
--- a/perl-install/network/isdn.pm
+++ b/perl-install/network/isdn.pm
@@ -51,7 +51,7 @@ defaultroute
if ($isdn->{driver} eq "capidrv") {
setup_capi_conf(get_capi_card($isdn));
services::start_service_on_boot("capi4linux");
- services::restart("capi4linux");
+ services::start("capi4linux");
} else {
services::stop("capi4linux");
services::do_not_start_service_on_boot("capi4linux");
@@ -74,6 +74,9 @@ sub setup_capi_conf {
$in->do_pkgs->install("$capi_card->{driver}-firmware");
}
+ #- stop capi4linux before new config is written so that it can unload the driver
+ services::stop("capi4linux");
+
my $capi_conf;
my $firmware = $capi_card->{firmware} || '-';
if ($capi_card->{driver} eq "fcclassic") {