From f5b8ed98986104ebefeac832a37aa99867db1822 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 16 Dec 2005 12:10:29 +0000
Subject: when upgrading, merge existing modprobe.conf (and do it when /mnt is
 mounted, not before!)

---
 perl-install/install2.pm | 2 --
 1 file changed, 2 deletions(-)

(limited to 'perl-install/install2.pm')

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 95f4b925f..659bb718a 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -143,8 +143,6 @@ sub selectInstallClass {
 	@{$o->{orderedSteps}} = uniq(map {
 	    $_ eq 'selectInstallClass' ? ($_, 'doPartitionDisks', 'formatPartitions') : $_;
 	} @{$o->{orderedSteps}});
-
-	$o->{modules_conf}->merge_into(modules::any_conf->read);
     }
 }
 
-- 
cgit v1.2.1