summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>1999-09-13 22:03:33 +0000
committerPascal Rigaux <pixel@mandriva.com>1999-09-13 22:03:33 +0000
commit23c152b7d199b290607b3d3e3a14d76dbaa60e90 (patch)
tree495014e3fa3d0e8266f5d243381bbcbb94ae35be /perl-install/modules.pm
parentb121ba06131e915ff2dd837c8d7d0bd13fb3ac40 (diff)
downloaddrakx-backup-do-not-use-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar
drakx-backup-do-not-use-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar.gz
drakx-backup-do-not-use-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar.bz2
drakx-backup-do-not-use-23c152b7d199b290607b3d3e3a14d76dbaa60e90.tar.xz
drakx-backup-do-not-use-23c152b7d199b290607b3d3e3a14d76dbaa60e90.zip
no_comment
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index d0c38d49c..22584aa1b 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -285,10 +285,12 @@ sub write_conf {
}
sub get_stage1_conf {
- %conf = read_conf($_[0], \$scsi);
+ %conf = read_conf($_[1], \$scsi);
+ add2hash(\%conf, $_[0]);
$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";
+ \%conf;
}
sub load_thiskind($;&) {