diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2010-04-23 12:06:41 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2010-04-23 12:06:41 +0000 |
| commit | 782195756bbec44cf345820ee02840d971926e33 (patch) | |
| tree | e9d9978f50e91d89c8fb7be411d0824527ea216c /perl-install | |
| parent | 6903fbf5a5ce4c4919d51183ab8418827b20ca8e (diff) | |
| download | drakx-782195756bbec44cf345820ee02840d971926e33.tar drakx-782195756bbec44cf345820ee02840d971926e33.tar.gz drakx-782195756bbec44cf345820ee02840d971926e33.tar.bz2 drakx-782195756bbec44cf345820ee02840d971926e33.tar.xz drakx-782195756bbec44cf345820ee02840d971926e33.zip | |
fix creating encrypted LVM
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 80d53c49d..0106ca26b 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -4,6 +4,7 @@ o handle deleting encrypted partitions o display lock icon on encrypted partitions o fix loading of dmcrypt info now that /dev/mapper/* are symlinks + o fix creating encrypted LVM Version 13.20 - 21 April 2010 diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 13dd760b0..4c4432012 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -558,6 +558,7 @@ First remove a primary partition and create an extended partition.")); my $p = find { $part->{dm_name} eq $_->{dmcrypt_name} } @{$all_hds->{dmcrypts}}; my $p2 = fs::type::type_name2subpart($requested_type); $p->{fs_type} = $p2->{fs_type}; + $p->{type_name} = $requested_type; if ($::isStandalone) { fs::format::check_package_is_installed_format($in->do_pkgs, $p->{fs_type}) or log::l("Missing package"); } @@ -566,7 +567,7 @@ First remove a primary partition and create an extended partition.")); } $p->{isFormatted} = 0; #- force format; my ($_w, $wait_message) = $in->wait_message_with_progress_bar; - fs::format::part($all_hds, $p, $wait_message); + fs::format::part($all_hds, $p, $wait_message) unless isRawLVM($p); } warn_if_renumbered($in, $hd); @@ -1373,7 +1374,7 @@ sub format_part_info { $info .= N("Mounted\n") if $part->{isMounted}; $info .= N("RAID %s\n", $part->{raid}) if isPartOfRAID($part); if (fs::type::isRawLUKS($part) || $part->{dmcrypt_name}) { - $info .= N("Encrypted"); + $info .= N("Encrypted")."\n"; if (fs::type::isRawLUKS($part)) { $info .= ($part->{dm_active} && $part->{dm_name} ? N(" (mapped on %s)", $part->{dm_name}) : $part->{dm_name} ? N(" (to map on %s)", $part->{dm_name}) : |