summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-05-23 18:27:28 +0000
committerThierry Vignaud <tv@mageia.org>2012-05-23 18:27:28 +0000
commite6e178ef0973bbe18d18d6b5314f9dacafce3592 (patch)
tree26f7580e4a98e68f4e43dd38bece567970222191
parent6530dc271a4f5b72662022298d7d8cc838c22409 (diff)
downloaddrakx-e6e178ef0973bbe18d18d6b5314f9dacafce3592.tar
drakx-e6e178ef0973bbe18d18d6b5314f9dacafce3592.tar.gz
drakx-e6e178ef0973bbe18d18d6b5314f9dacafce3592.tar.bz2
drakx-e6e178ef0973bbe18d18d6b5314f9dacafce3592.tar.xz
drakx-e6e178ef0973bbe18d18d6b5314f9dacafce3592.zip
(_format_raw) factorize with similar code
-rw-r--r--perl-install/diskdrake/interactive.pm13
1 files changed, 4 insertions, 9 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index af71d894f..8a4d9bb9c 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -568,13 +568,7 @@ First remove a primary partition and create an extended partition."));
if ($::isStandalone) {
fs::format::check_package_is_installed_format($in->do_pkgs, $p->{fs_type}) or log::l("Missing package");
}
- if ($::expert && !member($p->{fs_type}, 'reiserfs', 'xfs', 'hfs', 'ntfs', 'ntfs-3g')) {
- $p->{toFormatCheck} = $in->ask_yesorno(N("Confirmation"), N("Check for bad blocks?"));
- }
- $p->{isFormatted} = 0; #- force format;
- # Wait for the newly created device to appear before formatting it
- my ($_w, $wait_message) = $in->wait_message_with_progress_bar;
- fs::format::part($all_hds, $p, $wait_message) unless isRawLVM($p);
+ _format_raw($in, $p, $all_hds, isRawLVM($p));
}
warn_if_renumbered($in, $hd);
@@ -1294,13 +1288,14 @@ sub format_ {
}
sub _format_raw {
- my ($in, $part, $all_hds) = @_;
+ my ($in, $part, $all_hds, $o_skip) = @_;
if ($::expert && !member($part->{fs_type}, 'reiserfs', 'xfs', 'hfs', 'ntfs', 'ntfs-3g')) {
$part->{toFormatCheck} = $in->ask_yesorno(N("Confirmation"), N("Check for bad blocks?"));
}
$part->{isFormatted} = 0; #- force format;
+ # Wait for the newly created device to appear before formatting it
my ($_w, $wait_message) = $in->wait_message_with_progress_bar;
- fs::format::part($all_hds, $part, $wait_message);
+ fs::format::part($all_hds, $part, $wait_message) if !$o_skip;
1;
}