From ee27ed2e0274b8912c8a943eed561dafa828efaa Mon Sep 17 00:00:00 2001
From: Mystery Man 553 <uid553@mandriva.org>
Date: Mon, 12 Feb 2001 18:51:43 +0000
Subject: (main): gc has done it again! /tmp/conf.modules is now
 /etc/modules.conf, so load both to keep compatibility.

---
 perl-install/install2.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'perl-install')

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") };
-- 
cgit v1.2.1