summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-07-11 22:04:30 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-07-12 01:57:28 +0200
commit352a9f279e532ef881c3291b88003905e956dd99 (patch)
tree6dc4d4e41c1dad51500ab56d0496354c2826a3d4 /perl-install/diskdrake
parentb772247c03172617edb17f92d9b7b22c09ca9091 (diff)
downloaddrakx-352a9f279e532ef881c3291b88003905e956dd99.tar
drakx-352a9f279e532ef881c3291b88003905e956dd99.tar.gz
drakx-352a9f279e532ef881c3291b88003905e956dd99.tar.bz2
drakx-352a9f279e532ef881c3291b88003905e956dd99.tar.xz
drakx-352a9f279e532ef881c3291b88003905e956dd99.zip
simplify: isBusy() already covers isPartOfLVM()
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r--perl-install/diskdrake/interactive.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 086fc2183..ce973a0f4 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -409,7 +409,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) && is_LVM_resizable',
- N_("Format") => '!isBusy && !cannotBeMountable && !isPartOfLVM && (!readonly && ($::expert || $::isStandalone) || fs::type::isRawLUKS($part))',
+ N_("Format") => '!isBusy && !cannotBeMountable && (!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',