From 9eea640f641b1fa2ebc26d57dba550ef696ae963 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Tue, 1 Feb 2005 09:24:54 +0000
Subject: $hd is now unused, no need to pass it

---
 perl-install/diskdrake/interactive.pm | 10 +++++-----
 perl-install/fsedit.pm                |  8 ++++----
 perl-install/loopback.pm              |  2 +-
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'perl-install')

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 {
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index e2bf8d955..86278aaeb 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -391,7 +391,7 @@ sub suggestions_mntpoint {
 #- you can do this before modifying $part->{mntpoint}
 #- so $part->{mntpoint} should not be used here, use $mntpoint instead
 sub check_mntpoint {
-    my ($mntpoint, $hd, $part, $all_hds) = @_;
+    my ($mntpoint, $part, $all_hds) = @_;
 
     $mntpoint eq '' || isSwap($part) || isNonMountable($part) and return 0;
     $mntpoint =~ m|^/| or die N("Mount points must begin with a leading /");
@@ -402,7 +402,7 @@ sub check_mntpoint {
 No bootloader is able to handle this without a /boot partition.
 Please be sure to add a /boot partition") if $mntpoint eq "/" && isRAID($part) && !fs::get::has_mntpoint("/boot", $all_hds);
     die N("You can not use a LVM Logical Volume for mount point %s", $mntpoint)
-      if $mntpoint eq '/boot' && isLVM($hd);
+      if $mntpoint eq '/boot' && isLVM($part);
     cdie N("You've selected a LVM Logical Volume as root (/).
 The bootloader is not able to handle this without a /boot partition.
 Please be sure to add a /boot partition") if $mntpoint eq "/" && isLVM($part) && !fs::get::has_mntpoint("/boot", $all_hds);
@@ -421,7 +421,7 @@ Please be sure to add a /boot partition") if $mntpoint eq "/" && isLVM($part) &&
       if $part->{options} =~ /encrypted/ && member($mntpoint, qw(/ /usr /var /boot));
 
     local $part->{mntpoint} = $mntpoint;
-    loopback::check_circular_mounts($hd, $part, $all_hds);
+    loopback::check_circular_mounts($part, $all_hds);
 }
 
 sub add {
@@ -429,7 +429,7 @@ sub add {
 
     isSwap($part) ?
       ($part->{mntpoint} = 'swap') :
-      $options->{force} || check_mntpoint($part->{mntpoint}, $hd, $part, $all_hds);
+      $options->{force} || check_mntpoint($part->{mntpoint}, $part, $all_hds);
 
     delete $part->{maxsize};
 
diff --git a/perl-install/loopback.pm b/perl-install/loopback.pm
index ba862a14a..96e542ab8 100644
--- a/perl-install/loopback.pm
+++ b/perl-install/loopback.pm
@@ -20,7 +20,7 @@ sub carryRootLoopback {
 }
 
 sub check_circular_mounts {
-    my ($_hd, $part, $all_hds) = @_;
+    my ($part, $all_hds) = @_;
 
     my $fstab = [ fs::get::fstab($all_hds), $part ]; # no pb if $part is already in $all_hds
 
-- 
cgit v1.2.1