summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2003-11-06 12:50:24 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2003-11-06 12:50:24 +0000
commita6b62ff406a15ce28c60d74406e7831e2e51f52b (patch)
treeca7275bbfdeea7dad119683b8c8d3289de32168f
parent8f042ae66a87164de605ce880478d676ddbbdba9 (diff)
downloaddrakx-a6b62ff406a15ce28c60d74406e7831e2e51f52b.tar
drakx-a6b62ff406a15ce28c60d74406e7831e2e51f52b.tar.gz
drakx-a6b62ff406a15ce28c60d74406e7831e2e51f52b.tar.bz2
drakx-a6b62ff406a15ce28c60d74406e7831e2e51f52b.tar.xz
drakx-a6b62ff406a15ce28c60d74406e7831e2e51f52b.zip
(conf_network_card_backend) fix unseen/unconfigured usb wireless
devices due to francois trap for aliased interfaces (new detect_device::getNet() filter out aliases which were the reasons for the test) btw, if no alias was found, there's a bug somewhere
-rw-r--r--perl-install/network/ethernet.pm3
1 files changed, 1 insertions, 2 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 8c3bb5b56..88ece2e96 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -123,8 +123,7 @@ sub conf_network_card_backend {
}
$a ||= $b;
$a and $saved_driver = $a;
- if_($::isInstall || $interface_state =~ /inet addr|Bcast|Mask|Interrupt|Base address/ && $a,
- [$interface, $saved_driver]);
+ [ $interface, $saved_driver ]
} @all_cards;
}
$o_interface =~ /eth[0-9]+/ or die("the interface is not an ethx");
he printer's CD does not work) and extract the firmware file from it by decompressing the self-extracting '.exe' file with the 'unzip' utility and searching for the 'sihp1000.img' file. Copy this file into the '/etc/printer' directory. There it will be found by the automatic uploader script and uploaded whenever the printer is connected and turned on.
");
diff --git a/perl-install/standalone/scannerdrake b/perl-install/standalone/scannerdrake
index 7e6f9a125..be0ec07b2 100755
--- a/perl-install/standalone/scannerdrake
+++ b/perl-install/standalone/scannerdrake
@@ -30,9 +30,9 @@ use handle_configs;
use services;
my $companyname = "Mandriva";
-my $distroname = "Mandrakelinux";
-my $shortdistroname = "Mandrakelinux";
-my $domainname = "mandrakesoft.com";
+my $distroname = "Mandrivalinux";
+my $shortdistroname = "Mandrivalinux";
+my $domainname = "mandriva.com";
foreach (@ARGV) {
/^--update-usbtable$/ and do { scanner::updateScannerDBfromUsbtable(); exit() };