summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-02-16 13:46:23 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-02-16 13:46:23 +0000
commit446a14975d5e40a4092b406a6e3d9fa834e9a616 (patch)
treef97da71c3fc544cb6163c47410df91771c988263
parent5470576f181cca9d37bd314028d90cb30b040589 (diff)
downloaddrakx-446a14975d5e40a4092b406a6e3d9fa834e9a616.tar
drakx-446a14975d5e40a4092b406a6e3d9fa834e9a616.tar.gz
drakx-446a14975d5e40a4092b406a6e3d9fa834e9a616.tar.bz2
drakx-446a14975d5e40a4092b406a6e3d9fa834e9a616.tar.xz
drakx-446a14975d5e40a4092b406a6e3d9fa834e9a616.zip
don't offer to format LVM
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/install/NEWS1
3 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index eca05fb1a..285107d4f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,6 +1,7 @@
- reorganized modules in fs section of list_modules and added reiser4
- diskdrake:
o limit partition type list to 2 colmuns instead of 4
+ o don't offer to format LVM
Version 11.87 - 14 February 2009
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index c86de51d3..b899a2038 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -403,7 +403,7 @@ sub part_possible_actions {
N_("Options") => '!isSwap($part) && !isNonMountable && $::expert',
N_("Label") => '!isNonMountable && $::expert && fs::format::canEditLabel($part)',
N_("Resize") => '!isBusy && !readonly && !isSpecial || isLVM($hd) && LVM_resizable',
- N_("Format") => '!isBusy && (!readonly && ($::expert || $::isStandalone) || fs::type::isRawLUKS($part))',
+ N_("Format") => '!isBusy && !isRawLVM && !isPartOfLVM && (!readonly && ($::expert || $::isStandalone) || fs::type::isRawLUKS($part))',
N_("Mount") => '!isBusy && (hasMntpoint || isSwap) && maybeFormatted && ($::expert || $::isStandalone)',
N_("Add to RAID") => '!isBusy && isRawRAID && (!isSpecial || isRAID)',
N_("Add to LVM") => '!isBusy && isRawLVM',
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 77e668a47..a872ccd21 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,6 +1,7 @@
- don't crash on invalid partition table
- fix paths for installer (#47871)
- limit partition type list to 2 colmuns instead of 4
+- don't offer to format LVM
Version 11.86 - 12 February 2009