From 92761bf6a9c1b987096d32568233fd3fd13c2b5b Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 21 Feb 2008 09:13:16 +0000
Subject: - diskdrake:   o fix switching from LABEL=xxx to /dev/yyy in fstab
 (#37914)

merge_fstabs() was doing add2hash, replacing it with add2hash_ so that
faked_device => 1 from fstab is not kept
---
 perl-install/NEWS      | 2 ++
 perl-install/fs.pm     | 2 +-
 perl-install/fsedit.pm | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index e1e72d482..bab36593b 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake:
+  o fix switching from LABEL=xxx to /dev/yyy in fstab (#37914)
 - add support for snd-aw2
 - drakboot --boot:
   o fix dropping grub "configfile" entries when switching to lilo
diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index e672d2c98..ea95242cc 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -121,7 +121,7 @@ sub merge_fstabs {
 	if (!$loose) {
 	    $p->{fs_type} = $p2->{fs_type} if $p2->{fs_type};
 	    $p->{options} = $p2->{options} if $p2->{options};
-	    add2hash($p, $p2);
+	    add2hash_($p, $p2);
 	} else {
 	    $p->{isMounted} ||= $p2->{isMounted};
 	    $p->{real_mntpoint} ||= $p2->{real_mntpoint};
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index e20e44a8f..6260c9271 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -268,6 +268,8 @@ Do you agree to lose all the partitions?
 
     fs::get_major_minor([ fs::get::fstab($all_hds) ]);
 
+    $_->{faked_device} = 0 foreach fs::get::fstab($all_hds);
+
     $all_hds;
 }
 
-- 
cgit v1.2.1