summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-26 14:54:53 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-26 14:54:53 +0000
commit3b76821ca701429c285d3dea2f7daf3af6e5abdc (patch)
tree79ca1192fcc2c271d8ddd04d56a20add3e643e07 /perl-install
parent897470a4ba57b7dea1006190fc3e35eded8c4ded (diff)
downloaddrakx-3b76821ca701429c285d3dea2f7daf3af6e5abdc.tar
drakx-3b76821ca701429c285d3dea2f7daf3af6e5abdc.tar.gz
drakx-3b76821ca701429c285d3dea2f7daf3af6e5abdc.tar.bz2
drakx-3b76821ca701429c285d3dea2f7daf3af6e5abdc.tar.xz
drakx-3b76821ca701429c285d3dea2f7daf3af6e5abdc.zip
- let be faster when trying to install already installed packages
- fix next step name when installing kppp
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/network/netconnect.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 86b71541d..496a1d7a4 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -513,8 +513,8 @@ killall pppd
post => sub {
network::modem::ppp_configure($in, $modem);
$netc->{$_} = 'ppp0' foreach 'NET_DEVICE', 'NET_INTERFACE';
+ $in->do_pkgs->ensure_is_installed('kdenetwork-kppp', '/usr/bin/kppp');
$handle_multiple_cnx->();
- $in->do_pkgs->install('kdenetwork-kppp');
},
},
@@ -536,14 +536,14 @@ killall pppd
list => \@adsl_devices, } ],
post => sub {
my %packages = (
- 'eci' => 'eciadsl',
- 'sagem' => 'adiusbadsl',
- 'speedtouch' => 'speedtouch',
+ 'eci' => [ 'eciadsl', 'missing' ],
+ 'sagem' => [ 'adiusbadsl', '/usr/sbin/adictrl' ],
+ 'speedtouch' => [ 'speedtouch', '/usr/share/speedtouch/speedtouch.sh' ],
);
$adsl_device = { reverse %adsl_devices }->{$ntf_name} || $ntf_name; # ethernet device case
return 'adsl_unsupported_eci' if $adsl_device eq 'eci';
$netconnect::need_restart_network = member($adsl_device, qw(speedtouch eci));
- $in->do_pkgs->install($packages{$adsl_device}) if $packages{$adsl_device};
+ $in->do_pkgs->ensure_is_installed(@{$packages{$adsl_device}}) if $packages{$adsl_device};
return 'adsl_sagem800' if $adsl_device eq 'sagem';
if ($adsl_device eq 'speedtouch' && !$::testing) {
$in->do_pkgs->what_provides("speedtouch_mgmt") and