summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2016-07-12 00:57:36 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2016-07-12 01:56:31 +0200
commitb772247c03172617edb17f92d9b7b22c09ca9091 (patch)
treeca4c8e19fe6acb3b98348e80366662a3e6d464ae /perl-install
parentb9bb780015a57f1df1080175bce0e501d4825593 (diff)
downloaddrakx-b772247c03172617edb17f92d9b7b22c09ca9091.tar
drakx-b772247c03172617edb17f92d9b7b22c09ca9091.tar.gz
drakx-b772247c03172617edb17f92d9b7b22c09ca9091.tar.bz2
drakx-b772247c03172617edb17f92d9b7b22c09ca9091.tar.xz
drakx-b772247c03172617edb17f92d9b7b22c09ca9091.zip
don't offer to format RAID or BIOS boot partition
Diffstat (limited to 'perl-install')
-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 e63beb6f0..fdc2ac150 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,5 @@
- diskdrake:
+ o don't offer to format RAID or BIOS boot partition
o make clear a BIOS boot partition cannot have a mount point
Version 17.50 - 8 July 2016
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index c2cf7a149..086fc2183 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 && !isRawLVM && !isPartOfLVM && (!readonly && ($::expert || $::isStandalone) || fs::type::isRawLUKS($part))',
+ N_("Format") => '!isBusy && !cannotBeMountable && !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 78c21cf86..82390140a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- fix starting spice-vdagentd
- partionning:
+ o don't offer to format RAID or BIOS boot partition
o make clear a BIOS boot partition cannot have a mount point
Version 17.50 - 8 July 2016