summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2002-03-11 10:23:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2002-03-11 10:23:10 +0000
commit87f2e8cf32914530d089b75b00366bd95aafb1df (patch)
treeee291ac89bd2506dd47f862a959d49af7652c8a1
parent93771f2b43d02f366cd7febe8c27aa6c63fcb786 (diff)
downloaddrakx-87f2e8cf32914530d089b75b00366bd95aafb1df.tar
drakx-87f2e8cf32914530d089b75b00366bd95aafb1df.tar.gz
drakx-87f2e8cf32914530d089b75b00366bd95aafb1df.tar.bz2
drakx-87f2e8cf32914530d089b75b00366bd95aafb1df.tar.xz
drakx-87f2e8cf32914530d089b75b00366bd95aafb1df.zip
(Mount_point): when files exist in the chosen mount point, propose migration
-rw-r--r--perl-install/diskdrake/interactive.pm8
1 files changed, 8 insertions, 0 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index b109474e6..ab8cb0e22 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -521,6 +521,7 @@ sub Type {
sub Mount_point {
my ($in, $hd, $part, $all_hds) = @_;
+ my $migrate_files;
my $mntpoint = $part->{mntpoint} || do {
my $part_ = { %$part };
if (fsedit::suggest_part($part_, $all_hds)) {
@@ -539,10 +540,17 @@ sub Mount_point {
_("Can't unset mount point as this partition is used for loop back.
Remove the loopback first")), return 1;
$part->{mntpoint} eq $mntpoint || check_mntpoint($in, $mntpoint, $hd, $part, $all_hds) or return 1;
+ $migrate_files = need_migration($in, $mntpoint) or return 1;
0;
}
) or return;
$part->{mntpoint} = $mntpoint;
+
+ if ($migrate_files eq 'migrate') {
+ format_($in, $hd, $part, $all_hds) or return;
+ migrate_files($in, $hd, $part);
+ fs::mount_part($part);
+ }
}
sub Mount_point_raw_hd {
my ($in, $part, $all_hds, $propositions) = @_;