summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-02-24 13:28:07 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-02-24 13:28:07 +0000
commit6b1378cc92c3be92e8235182a51e800a628ade6a (patch)
treee2ce50ba8b75008fc13e159b0e2d21137523b517
parentac2b0e7ca712d3da0f3da49e615a08a603e488cd (diff)
downloaddrakx-6b1378cc92c3be92e8235182a51e800a628ade6a.tar
drakx-6b1378cc92c3be92e8235182a51e800a628ade6a.tar.gz
drakx-6b1378cc92c3be92e8235182a51e800a628ade6a.tar.bz2
drakx-6b1378cc92c3be92e8235182a51e800a628ade6a.tar.xz
drakx-6b1378cc92c3be92e8235182a51e800a628ade6a.zip
fix module lookup for pcmcia cards
-rw-r--r--perl-install/network/netconnect.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 9e0181438..1614c88b6 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -145,7 +145,7 @@ sub real_main {
my $find_lan_module = sub {
if (my $dev = find { $_->{device} eq $ethntf->{DEVICE} } detect_devices::pcmcia_probe()) { # PCMCIA case
- $module = $b->{driver};
+ $module = $dev->{driver};
} elsif (my $dev = find { $_->[0] eq $ethntf->{DEVICE} } @all_cards) {
$module = $dev->[1];
} else { $module = "" }
lass='head'>diff --git a/perl-install/share/advertising/dwd-03.pl b/perl-install/share/advertising/dwd-03.pl
new file mode 100644
index 000000000..4203973c1
--- /dev/null
+++ b/perl-install/share/advertising/dwd-03.pl
@@ -0,0 +1,12 @@
+#!/usr/bin/perl
+
+$width = 556;
+$height = 303;
+
+$y_start = 80;
+
+$title = N("What is Mandrake Linux?");
+
+@text = (N("Mandrake Linux is an Open Source distribution created with thousands of the choicest applications from the Free Software world. Mandrake Linux is one the most widely used Linux distributions worldwide!"),
+ '',
+ N("Mandrake Linux includes the famous graphical desktops KDE and GNOME, plus the latest versions of the most popular Open Source applications."));