summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/modules.pm8
1 files changed, 7 insertions, 1 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index bd4f523e4..da299df0c 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -533,6 +533,11 @@ sub read_conf($;$) {
\%c;
}
+sub mergein_conf {
+ my ($file) = @_;
+ add2hash(\%conf, read_conf($file, \$scsi));
+}
+
sub write_conf {
my ($prefix) = @_;
@@ -563,7 +568,8 @@ sub write_conf {
}
sub read_stage1_conf {
- add2hash(\%conf, read_conf($_[0], \$scsi));
+ mergein_conf($_[0]);
+
if (arch() =~ /sparc/) {
$conf{parport_lowlevel}{alias} ||= "parport_ax";
$conf{plip}{"pre-install"} ||= "modprobe parport_ax ; echo 7 > /proc/parport/0/irq"; #- TOCHECK