diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-05-06 08:26:02 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-05-06 08:26:02 +0000 |
| commit | 43ea3670136da2f5f65d0574da330712261246b7 (patch) | |
| tree | 1bcf6ca1a6e047b744be756edf50cfd1bc21e644 | |
| parent | 2fd00801727c1a81085d88879b8ff30a5162925c (diff) | |
| download | drakx-43ea3670136da2f5f65d0574da330712261246b7.tar drakx-43ea3670136da2f5f65d0574da330712261246b7.tar.gz drakx-43ea3670136da2f5f65d0574da330712261246b7.tar.bz2 drakx-43ea3670136da2f5f65d0574da330712261246b7.tar.xz drakx-43ea3670136da2f5f65d0574da330712261246b7.zip | |
don't prefer_devfs_name when reading /proc/mounts (which uses devfs names)
| -rw-r--r-- | perl-install/fs.pm | 8 | ||||
| -rwxr-xr-x | 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') { |