summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2001-09-14 17:47:54 +0000
committerdamien <damien@mandriva.com>2001-09-14 17:47:54 +0000
commit088d7668f73fd295d34d86854e4624268d035d69 (patch)
tree6a349a9ab54133ab640896d662e396eaf43e3d62
parent3bd2c253380344880bc99ab40aee72969f797906 (diff)
downloaddrakx-backup-do-not-use-088d7668f73fd295d34d86854e4624268d035d69.tar
drakx-backup-do-not-use-088d7668f73fd295d34d86854e4624268d035d69.tar.gz
drakx-backup-do-not-use-088d7668f73fd295d34d86854e4624268d035d69.tar.bz2
drakx-backup-do-not-use-088d7668f73fd295d34d86854e4624268d035d69.tar.xz
drakx-backup-do-not-use-088d7668f73fd295d34d86854e4624268d035d69.zip
pptp-adsl instead of pptp-adsl-fr
-rw-r--r--perl-install/install_any.pm2
-rw-r--r--perl-install/network/adsl.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 473d1b31d..fbea1410b 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -37,7 +37,7 @@ use fs;
XFree86-Mach64 XFree86-S3 XFree86-S3V XFree86-SVGA
XFree86-Sun XFree86-SunMono XFree86-Sun24 XFree86-FBDev XFree86-server
XFree86 XFree86-glide-module Device3Dfx Glide_V3-DRI Glide_V5 Mesa
-dhcpcd pump dhcpxd dhcp-client isdn4net isdn4k-utils dev pptp-adsl-fr rp-pppoe ppp ypbind
+dhcpcd pump dhcpxd dhcp-client isdn4net isdn4k-utils dev pptp-adsl rp-pppoe ppp ypbind
autologin
foomatic printer-utils printer-testpages gimpprint rlpr samba-client ncpfs nc
cups xpp qtcups kups cups-drivers lpr LPRng pdq ImageMagick
diff --git a/perl-install/network/adsl.pm b/perl-install/network/adsl.pm
index a5a8adcbf..8eff7212c 100644
--- a/perl-install/network/adsl.pm
+++ b/perl-install/network/adsl.pm
@@ -39,7 +39,7 @@ If you don't know, choose 'use pppoe'"), [__("use pppoe"), __("use pptp"), __("u
go_ethernet($netc, $intf, 'dhcp', '', '', $first_time) or goto conf_adsl_step1;
}
if ($type eq 'pptp') {
- $in->do_pkgs->install(qw(pptp-adsl-fr));
+ $in->do_pkgs->install(qw(pptp-adsl));
$netcnx->{type} = "adsl_$type";
$netcnx->{"adsl_$type"} = {};
adsl_conf($netcnx->{"adsl_$type"}, $netc, $intf, $type) or goto conf_adsl_step1;