diff options
author | Mystery Man 553 <uid553@mandriva.org> | 2001-02-12 18:51:43 +0000 |
---|---|---|
committer | Mystery Man 553 <uid553@mandriva.org> | 2001-02-12 18:51:43 +0000 |
commit | ee27ed2e0274b8912c8a943eed561dafa828efaa (patch) | |
tree | 9189255fedefa194155dd1a19d95b9bbe7a1caee | |
parent | eaf09100741150e552ac93f59dd9ea80dda15f25 (diff) | |
download | drakx-backup-do-not-use-ee27ed2e0274b8912c8a943eed561dafa828efaa.tar drakx-backup-do-not-use-ee27ed2e0274b8912c8a943eed561dafa828efaa.tar.gz drakx-backup-do-not-use-ee27ed2e0274b8912c8a943eed561dafa828efaa.tar.bz2 drakx-backup-do-not-use-ee27ed2e0274b8912c8a943eed561dafa828efaa.tar.xz drakx-backup-do-not-use-ee27ed2e0274b8912c8a943eed561dafa828efaa.zip |
(main): gc has done it again! /tmp/conf.modules is now /etc/modules.conf,
so load both to keep compatibility.
-rw-r--r-- | perl-install/install2.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 1345f0ae2..77bcd3e0b 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -556,7 +556,7 @@ sub main { modules::unload($_) foreach qw(vfat msdos fat); modules::load_deps(($::testing ? ".." : "") . "/modules/modules.dep"); - modules::read_stage1_conf("/tmp/conf.modules"); + modules::read_stage1_conf($_) foreach "/tmp/conf.modules", "/etc/modules.conf"; modules::read_already_loaded(); eval { modules::load("af_packet") }; |