diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2010-04-21 16:25:24 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2010-04-21 16:25:24 +0000 |
| commit | c5db0bde74fc91561ce2449a6da5be5a3211227b (patch) | |
| tree | 09d850a88314ca2f674c1426365fdd7189cb0ba3 /perl-install/fs | |
| parent | 25efa73c66538205781c5536ce1153216f8f9c51 (diff) | |
| download | drakx-backup-do-not-use-c5db0bde74fc91561ce2449a6da5be5a3211227b.tar drakx-backup-do-not-use-c5db0bde74fc91561ce2449a6da5be5a3211227b.tar.gz drakx-backup-do-not-use-c5db0bde74fc91561ce2449a6da5be5a3211227b.tar.bz2 drakx-backup-do-not-use-c5db0bde74fc91561ce2449a6da5be5a3211227b.tar.xz drakx-backup-do-not-use-c5db0bde74fc91561ce2449a6da5be5a3211227b.zip | |
First step of diskdrake crypto update
o offer encryption in a more visible way when creating a partition
o remove cryptoloop from diskdrake interface and transparently use dm-crypt
o support having dm-crypt partition with non default FS
Diffstat (limited to 'perl-install/fs')
| -rw-r--r-- | perl-install/fs/mount_options.pm | 3 | ||||
| -rw-r--r-- | perl-install/fs/type.pm | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/perl-install/fs/mount_options.pm b/perl-install/fs/mount_options.pm index 1413fc8a6..5bcb333b9 100644 --- a/perl-install/fs/mount_options.pm +++ b/perl-install/fs/mount_options.pm @@ -42,7 +42,6 @@ sub unpack { } $non_defaults->{relatime} = 1 if isTrueLocalFS($part) || $part->{fs_type} eq 'ntfs-3g'; - $non_defaults->{encrypted} = 1; my $defaults = { reverse %$non_defaults }; my %options = map { $_ => '' } keys %$non_defaults; @@ -111,8 +110,6 @@ sub pack { sub help() { ( - 'encrypted' => N("Use an encrypted file system"), - 'flush' => N("Flush write cache on file close"), 'grpquota' => N("Enable group disk quota accounting and optionally enforce limits"), diff --git a/perl-install/fs/type.pm b/perl-install/fs/type.pm index e49ac3ed4..b32da7891 100644 --- a/perl-install/fs/type.pm +++ b/perl-install/fs/type.pm @@ -185,7 +185,7 @@ if_(arch() !~ /ppc/, sub type_names { my ($expert, $o_hd) = @_; my @l = @{$type_names{important}}; - push @l, @{$type_names{non_fs_type}}; + push @l, grep { $_ ne 'Encrypted' } @{$type_names{non_fs_type}}; push @l, sort @{$type_names{other}} if $expert; if ($o_hd && !$o_hd->use_pt_type) { warn "$_ => $type_name2fs_type{$_}\n" foreach @l; |