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/modules/any_conf.pm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'perl-install/modules')

diff --git a/perl-install/modules/any_conf.pm b/perl-install/modules/any_conf.pm
index c6174fd81..fbf488937 100644
--- a/perl-install/modules/any_conf.pm
+++ b/perl-install/modules/any_conf.pm
@@ -168,8 +168,16 @@ sub write {
     modules::write_preload_conf($conf);
 }
 
+sub merge_into {
+    my ($conf, $conf2) = @_;
 
-
+    if (ref($conf) eq ref($conf2)) {
+	log::l("merging " . ref($conf));
+	add2hash($conf, $conf2);
+    } else {
+	log::l("not merging modules_conf " . ref($conf2) . " into " . ref($conf));	
+    }
+}
 
 ################################################################################
 sub read_handled {
-- 
cgit v1.2.1