summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-09-24 21:35:13 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-09-24 21:35:13 +0000
commit33d551048b714476402f01c0dc3f68c87eba2813 (patch)
tree62a7f47fbe6bf82f863e2e479ad9d282092acc94
parentaf9aea1dc8f73748be0fa90b2931c0e170eb0433 (diff)
downloaddrakx-33d551048b714476402f01c0dc3f68c87eba2813.tar
drakx-33d551048b714476402f01c0dc3f68c87eba2813.tar.gz
drakx-33d551048b714476402f01c0dc3f68c87eba2813.tar.bz2
drakx-33d551048b714476402f01c0dc3f68c87eba2813.tar.xz
drakx-33d551048b714476402f01c0dc3f68c87eba2813.zip
*** empty log message ***
-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