summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-04 16:54:19 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-04 16:54:19 +0000
commit68c3c1cd6e89d6a0f91f6c86510ec661864da336 (patch)
tree13b7ddd23376813d75e546241bcd09a8c8edd8a9 /perl-install/modules.pm
parentd1e96894b39e141a9c0fa6ef999eb751ef87ebf4 (diff)
downloaddrakx-68c3c1cd6e89d6a0f91f6c86510ec661864da336.tar
drakx-68c3c1cd6e89d6a0f91f6c86510ec661864da336.tar.gz
drakx-68c3c1cd6e89d6a0f91f6c86510ec661864da336.tar.bz2
drakx-68c3c1cd6e89d6a0f91f6c86510ec661864da336.tar.xz
drakx-68c3c1cd6e89d6a0f91f6c86510ec661864da336.zip
no_comment
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm13
1 files changed, 8 insertions, 5 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index f8bacd5cd..f24a844bf 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -308,7 +308,10 @@ sub read_conf {
# cheating here: not handling aliases of aliases
while (my ($k, $v) = each %c) {
$c{scsi} ||= $v->{scsi_hostadapter};
- add2hash($c{$v->{alias}} ||= {}, $v) if $v->{alias};
+ if (my $a = $v->{alias}) {
+ local $c{$a}{alias};
+ add2hash($c{$a}, $v);
+ }
}
%c;
}
@@ -328,7 +331,7 @@ sub write_conf {
print "#" if $scsi;
$scsi ||= 1;
}
- print F "$type $mod $v2\n";
+ print F "$type $mod $v2\n" unless $type eq "loaded";
}
}
}
@@ -336,9 +339,9 @@ sub write_conf {
sub get_stage1_conf {
%conf = read_conf($_[0]);
- $conf{alias}{parport_lowlevel} ||= "parport_pc";
- $conf{"pre-install"}{pcmcia_core} ||= "/etc/rc.d/init.d/pcmcia start";
- $conf{"pre-install"}{plip} ||= "modprobe parport_pc ; echo 7 > /proc/parport/0/irq";
+ $conf{parport_lowlevel}{alias} ||= "parport_pc";
+ $conf{pcmcia_core}{"pre-install"} ||= "/etc/rc.d/init.d/pcmcia start";
+ $conf{plip}{"pre-install"} ||= "modprobe parport_pc ; echo 7 > /proc/parport/0/irq";
}
sub load_thiskind($;&) {