From 352a9f279e532ef881c3291b88003905e956dd99 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud Date: Mon, 11 Jul 2016 22:04:30 -0400 Subject: simplify: isBusy() already covers isPartOfLVM() --- perl-install/diskdrake/interactive.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', -- cgit v1.2.1