From 546f809d73cd908c7da65599467217fc76a8ca2d Mon Sep 17 00:00:00 2001
From: Francois Pons <fpons@mandriva.com>
Date: Thu, 14 Sep 2000 09:41:21 +0000
Subject: *** empty log message ***

---
 perl-install/any.pm                       | 17 ++++++++++++-----
 perl-install/install_any.pm               |  4 +++-
 perl-install/install_steps_interactive.pm |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/any.pm b/perl-install/any.pm
index a2237f85d..7989097f3 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -309,15 +309,15 @@ sub inspect {
 
 #-----modem conf
 sub pppConfig {
-    my ($in, $modem, $prefix) = @_;
+    my ($in, $modem, $prefix, $install) = @_;
     $modem or return;
 
     symlinkf($modem->{device}, "$prefix/dev/modem") or log::l("creation of $prefix/dev/modem failed");
-    $::isStandalone ? `urpmi --auto ppp` : $in->pkg_install("ppp") unless $::testing;
+    $install->(qw(ppp)) unless $::testing;
 
     my %toreplace;
     $toreplace{$_} = $modem->{$_} foreach qw(connection phone login passwd auth domain dns1 dns2);
-    $toreplace{kpppauth} = ${{ 'Script-based' => 0, 'PAP' => 1, 'Terminal-based' => 2, 'CHAP' => 3, }}{$modem->{auth}};
+    $toreplace{kpppauth} = ${{ 'Script-based' => 0, 'PAP' => 1, 'Terminal-based' => 2, }}{$modem->{auth}};
     $toreplace{phone} =~ s/\D//g;
     $toreplace{dnsserver} = join ',', map { $modem->{$_} } "dns1", "dns2";
     $toreplace{dnsserver} .= $toreplace{dnsserver} && ',';
@@ -379,7 +379,14 @@ END
 'ABORT' 'Login incorrect'
 '' 'ATZ'
 'OK'
-'ATDT$modem->{special_command}'
+END
+    if ($modem->{special_command}) {
+	print CHAT <<END;
+'$modem->{special_command}'
+'OK'
+END
+    }
+    print CHAT <<END
 'ATDT$toreplace{phone}'
 'CONNECT' ''
 END
@@ -413,7 +420,7 @@ END
 	}
 	#- restore access right to secrets file, just in case.
 	chmod 0600, $secrets;
-    } #- CHAP is not supported by initscripts, need patching before doing more on that here!
+    }
 
     #-install_any::template2userfile($o->{prefix}, "$ENV{SHARE_PATH}/kppprc.in", ".kde/share/config/kppprc", 1, %toreplace);
     commands::mkdir_("-p", "$prefix/usr/share/config");
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 201efe590..c4207525f 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -32,7 +32,9 @@ use fs;
 XFree86-8514 XFree86-AGX XFree86-Mach32 XFree86-Mach64 XFree86-Mach8 XFree86-Mono
 XFree86-P9000 XFree86-S3 XFree86-S3V XFree86-SVGA XFree86-W32 XFree86-I128
 XFree86-Sun XFree86-SunMono XFree86-Sun24 XFree86-3DLabs XFree86-FBDev XFree86-server
-XFree86 dhcpcd pump ppp ypbind rhs-printfilters pnm2ppa samba ncpfs kernel-fb
+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
+rhs-printfilters lpr cups cups-drivers pnm2ppa Lexmark-1100-printer-driver__lm1100 samba ncpfs kernel-fb
 );
 
 #-######################################################################################
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index c5ec33d20..77d533d13 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -576,7 +576,7 @@ sub configurePrinter {
 
     #- figure out what printing system to use, currently are suported cups and lpr,
     #- in case this has not be detected above.
-    $::beginner and $o->{printer}{mode} ||= 'CUPS';
+    $::expert or $o->{printer}{mode} ||= 'CUPS';
     if ($::expert || !$o->{printer}{mode}) {
 	$o->{printer}{mode} = $o->ask_from_list_([''], _("Which printing system do you want to use?"),
 						 [ 'CUPS', 'lpr', __("Cancel") ],
-- 
cgit v1.2.1