summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2010-04-22 12:44:48 +0000
committerPascal Terjan <pterjan@mandriva.org>2010-04-22 12:44:48 +0000
commitb3718d78d3ef21d1d024626d658111cb19bf8c8b (patch)
treecc488ad8bb5ab62e3dce3532003c64c0716e7061
parent461c34c603d469a1ab8fbacfe8f1968529925ee4 (diff)
downloaddrakx-backup-do-not-use-b3718d78d3ef21d1d024626d658111cb19bf8c8b.tar
drakx-backup-do-not-use-b3718d78d3ef21d1d024626d658111cb19bf8c8b.tar.gz
drakx-backup-do-not-use-b3718d78d3ef21d1d024626d658111cb19bf8c8b.tar.bz2
drakx-backup-do-not-use-b3718d78d3ef21d1d024626d658111cb19bf8c8b.tar.xz
drakx-backup-do-not-use-b3718d78d3ef21d1d024626d658111cb19bf8c8b.zip
do not warn about data loss when changing type of unformatted partition
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/diskdrake/interactive.pm6
2 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 14602e26c..e1a18059c 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- diskdrake:
+ o do not warn about data loss when changing type of unformatted partition
+
Version 13.20 - 21 April 2010
- diskdrake:
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 6fb1a3b6c..435500dbb 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -609,7 +609,11 @@ sub Type {
my $warned;
my $warn = sub {
$warned = 1;
- ask_alldatawillbelost($in, $part, N_("After changing type of partition %s, all data on this partition will be lost"));
+ if (maybeFormatted($part)) {
+ ask_alldatawillbelost($in, $part, N_("After changing type of partition %s, all data on this partition will be lost"));
+ } else {
+ 1;
+ }
};
#- for ext2/ext3, warn after choosing as ext2->ext3 and ext*->ext4 can be achieved without loosing any data :)