diff options
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/Xconfigurator.pm | 6 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 3 | ||||
| -rwxr-xr-x | perl-install/standalone/draknet | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm index a6f3f8d16..2f2281954 100644 --- a/perl-install/Xconfigurator.pm +++ b/perl-install/Xconfigurator.pm @@ -184,8 +184,8 @@ sub cardConfiguration(;$$$) { #- 3D acceleration configuration for XFree 3.3 using Utah-GLX. $card->{Utah_glx} = ($card->{identifier} =~ /Matrox.* G[24]00/ || #- 8bpp does not work. - $card->{identifier} =~ /3D Rage Pro AGP/ || #- by default only such card are supported, with AGP ? - $card->{type} =~ /Intel 810/); + $card->{identifier} =~ /3D Rage Pro AGP/); #- by default only such card are supported, with AGP ? + #- NOT WORKING $card->{type} =~ /Intel 810/); #- 3D acceleration configuration for XFree 3.3 using Utah-GLX but EXPERIMENTAL that may freeze the machine (FOR INFO NOT USED). $card->{Utah_glx_EXPERIMENTAL} = ($card->{type} =~ /RIVA TNT/ || #- all RIVA/GeForce comes from NVIDIA and may freeze (gltron). $card->{type} =~ /RIVA128/ || @@ -194,7 +194,7 @@ sub cardConfiguration(;$$$) { #- $card->{type} =~ /S3 ViRGE/ || #- 15bits only $card->{type} =~ /SiS /); #- 3D acceleration configuration for XFree 4.0 using DRI. - $card->{DRI_glx} = ($card->{identifier} =~ /Voodoo [35]/ || #- 16bit only #- NOT YET $card->{identifier} =~ /Voodoo Banshee/ || + $card->{DRI_glx} = ($card->{identifier} =~ /Voodoo [35]/ || $card->{identifier} =~ /Voodoo Banshee/ || #- 16bit only #- NOT WORKING $card->{identifier} =~ /Matrox.* G[24]00/ || #- prefer 16bit (24bit not well tested according to DRI) $card->{type} =~ /Intel 810/ || #- 16bit $card->{type} =~ /ATI Rage 128/); #- 16 and 32 bits, prefer 16bit as no DMA. diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index 298189c21..616c28b4b 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -502,7 +502,7 @@ sub selectMouse($) { sub configureNetwork { my ($o) = @_; require network; - network::configureNetwork2($o->{prefix}, $o->{netc}, $o->{intf}); + network::configureNetwork2($o->{prefix}, $o->{netc}, $o->{intf}, sub { $o->pkg_install(@_) }); } #------------------------------------------------------------------------------ diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index 04a5ac94a..c5ec33d20 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -467,7 +467,8 @@ sub afterInstallPackages($) { sub configureNetwork { my ($o, $first_time) = @_; require netconnect; - netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{pcmcia}, $o->{intf}, $first_time); + netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o->{netc}, $o->{mouse}, $o, $o->{pcmcia}, $o->{intf}, + sub { $o->pkg_install(@_) }, $first_time); } #-configureNetworkIntf moved to network diff --git a/perl-install/standalone/draknet b/perl-install/standalone/draknet index e29734595..78fb94be8 100755 --- a/perl-install/standalone/draknet +++ b/perl-install/standalone/draknet @@ -48,5 +48,5 @@ $::wizard_xpm = "/usr/share/pixmaps/internet.xpm"; my $in = vnew interactive('su'); -netconnect::intro('', $netcnx, $in, -e "/etc/pcmcia"); +netconnect::intro('', $netcnx, $in, -e "/etc/pcmcia", sub { system("urpmi --auto " . join(' ', @_)) }); $in->exit(0); |