From 0493ab2a5e7d5f8f4038730efc37919d90f647be Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 2 Jun 2005 05:38:11 +0000
Subject: read in existing modprobe.conf on upgrade (bugzilla #13309)

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

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

diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 6d40d923f..10a9abf8d 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -145,6 +145,8 @@ 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