diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2007-08-31 16:33:16 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2007-08-31 16:33:16 +0000 |
| commit | a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d (patch) | |
| tree | cd7cedd073f1494500f4f69a63f0f63e9af673a7 /perl-install/fs.pm | |
| parent | b18b20791cfce5c52a8fb20f2579449b6500da24 (diff) | |
| download | drakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.tar drakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.tar.gz drakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.tar.bz2 drakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.tar.xz drakx-a6ba2f19bd2dd6d99185cb0f5ba0dd97baaf130d.zip | |
- support for UUID (including UUID=xxx in fstab)
(not by default for now)
Diffstat (limited to 'perl-install/fs.pm')
| -rw-r--r-- | perl-install/fs.pm | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/fs.pm b/perl-install/fs.pm index 15de5228d..bdb364896 100644 --- a/perl-install/fs.pm +++ b/perl-install/fs.pm @@ -22,7 +22,7 @@ sub read_fstab { my ($prefix, $file, @reading_options) = @_; if (member('keep_default', @reading_options)) { - push @reading_options, 'freq_passno', 'keep_device_LABEL'; + push @reading_options, 'freq_passno', 'keep_device_LABEL', 'keep_device_UUID'; } my %comments; @@ -85,6 +85,10 @@ sub read_fstab { if ($h->{device_LABEL} && !$h->{device_alias} && member('keep_device_LABEL', @reading_options)) { $h->{prefer_device_LABEL} = 1; + } elsif ($h->{device_UUID} && !$h->{device_alias} && member('keep_device_UUID', @reading_options)) { + $h->{prefer_device_UUID} = 1; + } else { + $h->{prefer_device} = 1; } if ($h->{options} =~ /credentials=/ && !member('verbatim_credentials', @reading_options)) { |