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/install_steps.pm | 4 ++++
 1 file changed, 4 insertions(+)

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

diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index eba9df7a5..150657724 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -371,6 +371,10 @@ sub beforeInstallPackages {
 
     read_bootloader_config($o);
 
+    if ($o->{isUpgrade}) {
+	$o->{modules_conf}->merge_into(modules::any_conf->read);
+    }
+
     #- save these files in case of upgrade failure.
     if ($o->{isUpgrade}) {
 	foreach (@filesToSaveForUpgrade) {
-- 
cgit v1.2.1