summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mandriva.org>2009-11-17 23:35:02 +0000
committerPascal Terjan <pterjan@mandriva.org>2009-11-17 23:35:02 +0000
commit778b6f86075f44fe7cb1c29f05efa458edbb3b12 (patch)
tree6cb70418e9f3a297441771c1cb8deaaf905154b2
parent315c70d39887c01d48149467e37310318f11d899 (diff)
downloaddrakx-778b6f86075f44fe7cb1c29f05efa458edbb3b12.tar
drakx-778b6f86075f44fe7cb1c29f05efa458edbb3b12.tar.gz
drakx-778b6f86075f44fe7cb1c29f05efa458edbb3b12.tar.bz2
drakx-778b6f86075f44fe7cb1c29f05efa458edbb3b12.tar.xz
drakx-778b6f86075f44fe7cb1c29f05efa458edbb3b12.zip
diskdrake: allow to convert ext2/3 to ext4 but do not enable flags
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/interactive.pm10
-rw-r--r--perl-install/install/NEWS1
3 files changed, 10 insertions, 3 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e01889383..f34531f99 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -9,6 +9,8 @@
o rework UI layout to account for CONSOLE_LOGO support removal
- display_help: handle window.close() events (#55099)
- fix detecting hidden partitions as recovery
+- diskdrake:
+ o allow to convert ext2/3 to ext4 but do not enable flags
Version 12.77 - 30 October 2009
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 0948c9a0c..50a7674d7 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -575,8 +575,8 @@ sub Type {
ask_alldatawillbelost($in, $part, N_("After changing type of partition %s, all data on this partition will be lost"));
};
- #- for ext2, warn after choosing as ext2->ext3 can be achieved without loosing any data :)
- $part->{fs_type} eq 'ext2' || $part->{fs_type} =~ /ntfs/ or $warn->() or return;
+ #- for ext2/ext3, warn after choosing as ext2->ext3 and ext*->ext4 can be achieved without loosing any data :)
+ member($part->{fs_type}, qw(ext2 ext3)) || $part->{fs_type} =~ /ntfs/ or $warn->() or return;
my @types = fs::type::type_names($::expert, $hd);
@@ -593,7 +593,7 @@ sub Type {
my $type = $type_name && fs::type::type_name2subpart($type_name);
- if (member($type->{fs_type}, qw(ext2 ext3 ext4))) {
+ if ($part->{fs_type} eq 'ext2' && $type->{fs_type} eq 'ext3') {
my $_w = $in->wait_message(N("Please wait"), N("Switching from %s to %s", 'ext2', $type->{fs_type}));
if (run_program::run("tune2fs", "-j", devices::make($part->{device}))) {
put_in_hash($part, $type);
@@ -603,6 +603,10 @@ sub Type {
fs::format::disable_forced_fsck($part->{device});
return;
}
+ } elsif (member($part->{fs_type}, qw(ext2 ext3)) && $type->{fs_type} eq 'ext4') {
+ # FIXME enable some nice flags
+ put_in_hash($part, $type);
+ return;
} elsif ($type->{fs_type} =~ /ntfs/ && $part->{fs_type} =~ /ntfs/) {
if ($type->{fs_type} eq 'ntfs-3g') {
$in->do_pkgs->ensure_binary_is_installed('ntfs-3g', 'mount.ntfs-3g') or return;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index b284ac32c..7f73f432f 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- do not offer to upgrade/install in restore mode
- fix detecting hidden partitions as recovery
+- allow to convert ext2/3 to ext4 but do not enable flags
Version 12.77 - 30 October 2009