From 43ea3670136da2f5f65d0574da330712261246b7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Thu, 6 May 2004 08:26:02 +0000
Subject: don't prefer_devfs_name when reading /proc/mounts (which uses devfs
 names)

---
 perl-install/fs.pm                       | 8 ++++----
 perl-install/standalone/drakupdate_fstab | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/perl-install/fs.pm b/perl-install/fs.pm
index ab0822ddb..65c630f6c 100644
--- a/perl-install/fs.pm
+++ b/perl-install/fs.pm
@@ -92,7 +92,7 @@ sub read_fstab {
 
 	    if ($h->{device} =~ m!/(disc|part\d+)$!) {
 		$h->{devfs_device} = $h->{device};
-		$h->{prefer_devfs_name} = 1;
+		$h->{prefer_devfs_name} = 1 if member('keep_devfs_name', @reading_options);
 	    }
 	}
 
@@ -197,7 +197,7 @@ sub merge_info_from_fstab {
 	} else {
 	    1;
 	}
-    } read_fstab($prefix, "/etc/fstab", 'keep_freq_passno');
+    } read_fstab($prefix, '/etc/fstab', 'keep_freq_passno', 'keep_devfs_name');
 
     merge_fstabs($loose, $fstab, @l);
 }
@@ -205,7 +205,7 @@ sub merge_info_from_fstab {
 # - when using "$loose", it does not merge in type&options from the fstab
 sub get_info_from_fstab {
     my ($all_hds, $prefix) = @_;
-    my @l = read_fstab($prefix, "/etc/fstab", 'keep_freq_passno');
+    my @l = read_fstab($prefix, '/etc/fstab', 'keep_freq_passno', 'keep_devfs_name');
     add2all_hds($all_hds, @l)
 }
 
@@ -558,7 +558,7 @@ sub get_raw_hds {
 
     get_major_minor(@{$all_hds->{raw_hds}});
 
-    my @fstab = read_fstab($prefix, "/etc/fstab", 'keep_freq_passno');
+    my @fstab = read_fstab($prefix, '/etc/fstab', 'keep_freq_passno', 'keep_devfs_name');
     $all_hds->{nfss} = [ grep { isThisFs('nfs', $_) } @fstab ];
     $all_hds->{smbs} = [ grep { isThisFs('smbfs', $_) } @fstab ];
     $all_hds->{davs} = [ grep { isThisFs('davfs', $_) } @fstab ];
diff --git a/perl-install/standalone/drakupdate_fstab b/perl-install/standalone/drakupdate_fstab
index 4a12f4461..ab7878adc 100755
--- a/perl-install/standalone/drakupdate_fstab
+++ b/perl-install/standalone/drakupdate_fstab
@@ -130,7 +130,7 @@ sub main {
 	cp_af('/etc/fstab', $fstab_file = '/tmp/fstab');
     }
 
-    my $fstab = [ fs::read_fstab('', '/etc/fstab', 'keep_freq_passno', 'verbatim_credentials') ];
+    my $fstab = [ fs::read_fstab('', '/etc/fstab', 'keep_freq_passno', 'keep_devfs_name', 'verbatim_credentials') ];
     my ($existing_fstab_entries, $fstab_) = partition { $_->{device} eq $part->{device} || $_->{device} eq $part->{devfs_device} } @$fstab;
 
     if ($action eq 'add') {
-- 
cgit v1.2.1