summaryrefslogtreecommitdiffstats
path: root/perl-install/install_any.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-15 20:42:47 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-15 20:42:47 +0000
commit851338fe8bf4c8d057984431b542b333cbad4b8e (patch)
tree7029da4dde591025d410100a9b1b126967ba2f76 /perl-install/install_any.pm
parent91608779ad460d1481bec34e39db4661b4950441 (diff)
downloaddrakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar
drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.gz
drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.bz2
drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.tar.xz
drakx-851338fe8bf4c8d057984431b542b333cbad4b8e.zip
no_comment
Diffstat (limited to 'perl-install/install_any.pm')
-rw-r--r--perl-install/install_any.pm11
1 files changed, 6 insertions, 5 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 53fdf2798..749bb40ab 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -129,6 +129,7 @@ sub getFile {
ftp::getFile($rel);
} elsif ($::o->{method} eq "http") {
require http;
+ log::l("http getFile $f");
http::getFile($rel);
} else {
#- try to open the file, but examine if it is present in the repository, this allow
@@ -308,7 +309,7 @@ sub setPackages($) {
my @l = ();
push @l, "kapm", "kcmlaptop", "DrakProfile", "DrakSync" if $o->{pcmcia};
push @l, "Glide_V5" if detect_devices::matching_desc('Voodoo 5');
- push @l, "Glide_V3-DRI" if detect_devices::matching_desc('Voodoo 3');
+ push @l, "Glide_V3-DRI" if detect_devices::matching_desc('Voodoo (3|Banshee)');
push @l, "Device3Dfx", "XFree86-glide-module" if detect_devices::matching_desc('Voodoo');
require timezone;
require lang;
@@ -580,12 +581,12 @@ sub generate_ks_cfg {
cat_("/proc/mounts") =~ m|(\S+):(\S+)\s+/tmp/rhimage nfs| or die;
$ks .= "nfs --server $1 --dir $2\n";
}
- my %intf = %{$o->{intf}[0]};
- if ($intf{BOOTPROTO} =~ /^(dhcp|bootp)$/) {
- $ks .= "network --bootproto $intf{BOOTPROTO}\n";
+ my ($intf) = values %{$o->{intf}};
+ if ($intf->{BOOTPROTO} =~ /^(dhcp|bootp)$/) {
+ $ks .= "network --bootproto $intf->{BOOTPROTO}\n";
} else {
require network;
- my %l = (ip => $intf{IPADDR}, netmask => $intf{NETMASK}, gateway => $o->{netc}{GATEWAY});
+ my %l = (ip => $intf->{IPADDR}, netmask => $intf->{NETMASK}, gateway => $o->{netc}{GATEWAY});
$ks .= "network " . join(" ", map_each { $::b && "--$::a $::b" } %l);
$ks .= " --nameserver $_" foreach network::dnsServers($o->{netc});
$ks .= "\n";