diff options
author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-11-15 07:55:37 +0100 |
---|---|---|
committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-11-15 12:15:28 +0100 |
commit | 1a0d446cbcb09c770ad9c341b8f88698bb7339ad (patch) | |
tree | 59f33abafe8ecadc220a8c0aa17589de3ca04513 /perl-install/diskdrake/interactive.pm | |
parent | 4a217824737f82d15cf8120356111739d00269db (diff) | |
download | drakx-1a0d446cbcb09c770ad9c341b8f88698bb7339ad.tar drakx-1a0d446cbcb09c770ad9c341b8f88698bb7339ad.tar.gz drakx-1a0d446cbcb09c770ad9c341b8f88698bb7339ad.tar.bz2 drakx-1a0d446cbcb09c770ad9c341b8f88698bb7339ad.tar.xz drakx-1a0d446cbcb09c770ad9c341b8f88698bb7339ad.zip |
fix being unable to format a newly part (mga#19172)
previous test was using an unexported function
as a side effect, we now correctly offer to format a unmounted partition
(eg: when using "noauto" option in /etc/fstab)
Diffstat (limited to 'perl-install/diskdrake/interactive.pm')
-rw-r--r-- | perl-install/diskdrake/interactive.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 5a6f853e4..0f681ec1a 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -410,7 +410,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 && (!readonly && ($::expert || $::isStandalone) || fs::type::isRawLUKS($part))', + N_("Format") => '!isBusy && isFormatable && (!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', |