summaryrefslogtreecommitdiffstats
path: root/perl-install/diskdrake
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-02-01 09:24:54 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-02-01 09:24:54 +0000
commit9eea640f641b1fa2ebc26d57dba550ef696ae963 (patch)
tree1d8a16248e02356b2377b55cf4fe0b610361d6a6 /perl-install/diskdrake
parent3c825b15f52f521a681b177a50b4f1ff41a7711f (diff)
downloaddrakx-backup-do-not-use-9eea640f641b1fa2ebc26d57dba550ef696ae963.tar
drakx-backup-do-not-use-9eea640f641b1fa2ebc26d57dba550ef696ae963.tar.gz
drakx-backup-do-not-use-9eea640f641b1fa2ebc26d57dba550ef696ae963.tar.bz2
drakx-backup-do-not-use-9eea640f641b1fa2ebc26d57dba550ef696ae963.tar.xz
drakx-backup-do-not-use-9eea640f641b1fa2ebc26d57dba550ef696ae963.zip
$hd is now unused, no need to pass it
Diffstat (limited to 'perl-install/diskdrake')
-rw-r--r--perl-install/diskdrake/interactive.pm10
1 files changed, 5 insertions, 5 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 1e6dc5fab..d1ff0a291 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -627,7 +627,7 @@ sub Mount_point {
!isPartOfLoopback($part) || $mntpoint or $in->ask_warn('',
N("Can not 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;
+ $part->{mntpoint} eq $mntpoint || check_mntpoint($in, $mntpoint, $part, $all_hds) or return 1;
$migrate_files = need_migration($in, $mntpoint) or return 1;
0;
} },
@@ -655,7 +655,7 @@ sub Mount_point_raw_hd {
list => [ if_($mntpoint, $mntpoint), '', @propositions ],
not_edit => 0 } ],
complete => sub {
- $part->{mntpoint} eq $mntpoint || check_mntpoint($in, $mntpoint, {}, $part, $all_hds) or return 1;
+ $part->{mntpoint} eq $mntpoint || check_mntpoint($in, $mntpoint, $part, $all_hds) or return 1;
0;
}
) or return;
@@ -1033,10 +1033,10 @@ sub check_type {
1;
}
sub check_mntpoint {
- my ($in, $mntpoint, $hd, $part, $all_hds) = @_;
+ my ($in, $mntpoint, $part, $all_hds) = @_;
my $seen;
eval {
- catch_cdie { fsedit::check_mntpoint($mntpoint, $hd, $part, $all_hds) }
+ catch_cdie { fsedit::check_mntpoint($mntpoint, $part, $all_hds) }
sub { $seen = 1; $in->ask_okcancel('', formatError($@)) };
};
if (my $err = $@) {
@@ -1048,7 +1048,7 @@ sub check_mntpoint {
sub check {
my ($in, $hd, $part, $all_hds) = @_;
check_type($in, $part, $hd, $part) &&
- check_mntpoint($in, $part->{mntpoint}, $hd, $part, $all_hds);
+ check_mntpoint($in, $part->{mntpoint}, $part, $all_hds);
}
sub check_rebootNeeded {