summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2011-05-14 11:34:35 +0000
committerPascal Terjan <pterjan@mageia.org>2011-05-14 11:34:35 +0000
commitbffeb8c081f87a11c9c9302cf8d8eedeeb897cd1 (patch)
tree38648fe18e9dff88cfa811176982412da1bc2162
parent81365025d8ab393bc8aaaf9c2adae8ca946c83d2 (diff)
downloaddrakx-bffeb8c081f87a11c9c9302cf8d8eedeeb897cd1.tar
drakx-bffeb8c081f87a11c9c9302cf8d8eedeeb897cd1.tar.gz
drakx-bffeb8c081f87a11c9c9302cf8d8eedeeb897cd1.tar.bz2
drakx-bffeb8c081f87a11c9c9302cf8d8eedeeb897cd1.tar.xz
drakx-bffeb8c081f87a11c9c9302cf8d8eedeeb897cd1.zip
disbale encryption option for /boot
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a40c670c8..203d08104 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake: disbale encryption option for /boot
+
Version 13.51 - 12 May 2011
- harddrake: update icons
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index b1ec7e74a..600079cd5 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -504,7 +504,7 @@ sub Create {
if_($::expert && isLVM($hd),
{ label => N("Logical volume name "), val => \$part->{lv_name}, list => [ qw(root swap usr home var), '' ], sort => 0, not_edit => 0 },
),
- { label => N("Encrypt partition"), type => 'bool', val => \$use_dmcrypt },
+ { label => N("Encrypt partition"), type => 'bool', val => \$use_dmcrypt, disabled => sub { $part->{mntpoint} eq "/boot" } },
{ label => N("Encryption key "), val => \$part->{dmcrypt_key}, disabled => sub { !$use_dmcrypt }, hidden => 1, weakness_check => 1 },
{ label => N("Encryption key (again)"), val => \$part->{dmcrypt_key2}, disabled => sub { !$use_dmcrypt }, hidden => 1 },
], complete => sub {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 768d1e468..484e180b9 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- disbale encryption option for /boot
+
Version 13.50 - 06 May 2011
- use proper locales-XX packages for Albanian (#1036)