diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2010-04-22 15:32:14 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2010-04-22 15:32:14 +0000 |
| commit | 776f4edda81a8139ac2f18b84789e45ec60c1609 (patch) | |
| tree | c13825bc4f3dc7cc477e86a04a004de1d3d6379b /perl-install | |
| parent | 3bc4a1400cb57eaa50dcf2c7625d08492c72f269 (diff) | |
| download | drakx-776f4edda81a8139ac2f18b84789e45ec60c1609.tar drakx-776f4edda81a8139ac2f18b84789e45ec60c1609.tar.gz drakx-776f4edda81a8139ac2f18b84789e45ec60c1609.tar.bz2 drakx-776f4edda81a8139ac2f18b84789e45ec60c1609.tar.xz drakx-776f4edda81a8139ac2f18b84789e45ec60c1609.zip | |
fix loading of dmcrypt info now that /dev/mapper/* are symlinks
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/fs/dmcrypt.pm | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 36c34ae66..80d53c49d 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -3,6 +3,7 @@ o do not write partition table after creation if not needed o handle deleting encrypted partitions o display lock icon on encrypted partitions + o fix loading of dmcrypt info now that /dev/mapper/* are symlinks Version 13.20 - 21 April 2010 diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm index e817edd23..a831564ec 100644 --- a/perl-install/fs/dmcrypt.pm +++ b/perl-install/fs/dmcrypt.pm @@ -108,8 +108,11 @@ sub get_existing { sub _get_existing_one { my ($fstab, $active_dmcrypt) = @_; + my $p = fs::wild_device::to_subpart("/dev/mapper/$active_dmcrypt->{name}"); + my $part = { device => "mapper/$active_dmcrypt->{name}", size => $active_dmcrypt->{size}, - options => 'noatime', dmcrypt_name => $active_dmcrypt->{name} }; + options => 'noatime', dmcrypt_name => $active_dmcrypt->{name}, + major => $p->{major}, minor => $p->{minor} }; if (my $raw_part = find { fs::get::is_same_hd($active_dmcrypt, $_) } @$fstab) { $part->{rootDevice} = $raw_part->{device}; |