summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-12-11 13:18:06 +0000
committerThierry Vignaud <tv@mageia.org>2012-12-11 13:18:06 +0000
commit4418886a61d6f201223ce4ea9b79f329d4098c8b (patch)
tree2519e0abae60533fd31cf1cc37ed85abb953fe9a
parent3b4fc1cf5e70546128c70e95310a4c5c25ce5bb9 (diff)
downloaddrakx-4418886a61d6f201223ce4ea9b79f329d4098c8b.tar
drakx-4418886a61d6f201223ce4ea9b79f329d4098c8b.tar.gz
drakx-4418886a61d6f201223ce4ea9b79f329d4098c8b.tar.bz2
drakx-4418886a61d6f201223ce4ea9b79f329d4098c8b.tar.xz
drakx-4418886a61d6f201223ce4ea9b79f329d4098c8b.zip
(part) if a partition has been manually formated, don't offer to
format it again (for draklive-install, mga#7822)
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/fs/format.pm1
-rw-r--r--perl-install/install/NEWS4
3 files changed, 9 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 4d24633c6..6e48a7af2 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,7 @@
+- library:
+ o if a partition has been manually formated, don't offer to format
+ it again (for draklive-install, mga#7822)
+
Version 15.3 - 9 December 2012
- finish-install:
diff --git a/perl-install/fs/format.pm b/perl-install/fs/format.pm
index c511cf51d..5b87f22f1 100644
--- a/perl-install/fs/format.pm
+++ b/perl-install/fs/format.pm
@@ -114,6 +114,7 @@ sub part {
$wait_message->(N("Formatting partition %s", $part->{device})) if $wait_message;
part_raw($part, $wait_message);
}
+ undef $part->{toFormat};
}
sub write_label {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 4a4b95504..fb69e5e5b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,7 @@
+- partitionning:
+ o if a partition has been manually formated, don't offer to format
+ it again (mga#7822)
+
Version 15.8 - 11 December 2012
- fix installing basesystem prior to adding a supplementary network