summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-11-08 01:48:28 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-11-08 01:48:28 +0000
commit0f16f9693f47687136e5058916d0d04dcb611217 (patch)
tree621a0c76850737d6353385ece3f3fda54219f7b0 /perl-install/modules.pm
parent83e615434cf1bc3a692ab95b9b8aac3af6c366c8 (diff)
downloaddrakx-0f16f9693f47687136e5058916d0d04dcb611217.tar
drakx-0f16f9693f47687136e5058916d0d04dcb611217.tar.gz
drakx-0f16f9693f47687136e5058916d0d04dcb611217.tar.bz2
drakx-0f16f9693f47687136e5058916d0d04dcb611217.tar.xz
drakx-0f16f9693f47687136e5058916d0d04dcb611217.zip
no_comment
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm12
1 files changed, 5 insertions, 7 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 3c3d00ff6..c9e2031f5 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -245,12 +245,12 @@ sub read_conf($;$) {
add2hash($c{$a}, $v);
}
}
- %c;
+ \%c;
}
sub write_conf {
my ($file) = @_;
- my %written = read_conf($file);
+ my $written = read_conf($file);
my %net = detect_devices::net2module();
while (my ($k, $v) = each %net) {
@@ -262,18 +262,16 @@ sub write_conf {
while (my ($mod, $h) = each %conf) {
while (my ($type, $v2) = each %$h) {
- print F "$type $mod $v2\n" if $v2 && $type ne "loaded" && !$written{$mod}{$type};
+ print F "$type $mod $v2\n" if $v2 && $type ne "loaded" && !$written->{$mod}{$type};
}
}
}
-sub get_stage1_conf {
- %conf = read_conf($_[1], \$scsi);
- add2hash(\%conf, $_[0]);
+sub read_stage1_conf {
+ add2hash(\%conf, read_conf($_[0], \$scsi));
$conf{parport_lowlevel}{alias} ||= "parport_pc";
$conf{pcmcia_core}{"pre-install"} ||= "CARDMGR_OPTS=-f /etc/rc.d/init.d/pcmcia start";
$conf{plip}{"pre-install"} ||= "modprobe parport_pc ; echo 7 > /proc/parport/0/irq";
- \%conf;
}
sub load_thiskind($;&$) {