diff options
author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-05-23 16:10:03 +0000 |
---|---|---|
committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-05-23 16:10:03 +0000 |
commit | d6f5330ee63311a3e5c8ef52693ac7193ea83ede (patch) | |
tree | 597f252be23c47345b40109c08f58b8fa849b524 /perl-install/partition_table | |
parent | 9731f6a53e8701039a1fa0102427fbdd5eb60df0 (diff) | |
download | drakx-backup-do-not-use-d6f5330ee63311a3e5c8ef52693ac7193ea83ede.tar drakx-backup-do-not-use-d6f5330ee63311a3e5c8ef52693ac7193ea83ede.tar.gz drakx-backup-do-not-use-d6f5330ee63311a3e5c8ef52693ac7193ea83ede.tar.bz2 drakx-backup-do-not-use-d6f5330ee63311a3e5c8ef52693ac7193ea83ede.tar.xz drakx-backup-do-not-use-d6f5330ee63311a3e5c8ef52693ac7193ea83ede.zip |
perl_checker fixes
Diffstat (limited to 'perl-install/partition_table')
-rw-r--r-- | perl-install/partition_table/bsd.pm | 2 | ||||
-rw-r--r-- | perl-install/partition_table/raw.pm | 2 | ||||
-rw-r--r-- | perl-install/partition_table/sun.pm | 16 |
3 files changed, 10 insertions, 10 deletions
diff --git a/perl-install/partition_table/bsd.pm b/perl-install/partition_table/bsd.pm index d08cd57aa..e6af4e997 100644 --- a/perl-install/partition_table/bsd.pm +++ b/perl-install/partition_table/bsd.pm @@ -124,7 +124,7 @@ sub info { dtype => $hd->{device} =~ /^sd/ ? $dtype_scsi : $dtype_ST506, secsize => $common::SECTORSIZE, ncylinders => $hd->{geom}{cylinders}, - secpercyl => $hd->cylinder_size(), + secpercyl => $hd->cylinder_size, secprtunit => $hd->{geom}{totalsectors}, rpm => 3600, interleave => 1, diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm index 39a1ff026..acbec0458 100644 --- a/perl-install/partition_table/raw.pm +++ b/perl-install/partition_table/raw.pm @@ -152,7 +152,7 @@ sub zero_MBR { $type = "dos" if arch() =~ /ppc/ && detect_devices::get_mac_model() =~ /^IBM/; require "partition_table/$type.pm"; bless $hd, "partition_table::$type"; - $hd->{primary} = $hd->clear_raw(); + $hd->{primary} = $hd->clear_raw; delete $hd->{extended}; } diff --git a/perl-install/partition_table/sun.pm b/perl-install/partition_table/sun.pm index 9dcae18de..b92724e1f 100644 --- a/perl-install/partition_table/sun.pm +++ b/perl-install/partition_table/sun.pm @@ -47,15 +47,15 @@ sub adjustStart($$) { #- note that if start sector is on the first cylinder, it is adjusted #- to 0 and it is valid, cylinder 0 bug is from bad define for sparc #- compilation of mke2fs combined with a blind kernel... - $part->{start} = round_down($part->{start}, $hd->cylinder_size()); + $part->{start} = round_down($part->{start}, $hd->cylinder_size); $part->{size} = $end - $part->{start}; - $part->{size} = $hd->cylinder_size() if $part->{size} <= 0; + $part->{size} = $hd->cylinder_size if $part->{size} <= 0; } sub adjustEnd($$) { my ($hd, $part) = @_; my $end = $part->{start} + $part->{size}; - my $end2 = round_up($end, $hd->cylinder_size()); - $end2 = $hd->{geom}{cylinders} * $hd->cylinder_size() if $end2 > $hd->{geom}{cylinders} * $hd->cylinder_size(); + my $end2 = round_up($end, $hd->cylinder_size); + $end2 = $hd->{geom}{cylinders} * $hd->cylinder_size if $end2 > $hd->{geom}{cylinders} * $hd->cylinder_size; $part->{size} = $end2 - $part->{start}; } @@ -95,7 +95,7 @@ sub read($$) { foreach (0..$nb_primary-1) { my $h = { type => $infos_up[2 * $_], flag => $infos_up[1 + 2 * $_], start_cylinder => $partitions_up[2 * $_], size => $partitions_up[1 + 2 * $_] }; - $h->{start} = $sector + $h->{start_cylinder} * $hd->cylinder_size(); + $h->{start} = $sector + $h->{start_cylinder} * $hd->cylinder_size; $h->{type} && $h->{size} or $h->{$_} = 0 foreach keys %$h; push @pt, $h; } @@ -130,12 +130,12 @@ sub write($$$;$) { } ($info->{infos}, $info->{partitions}) = map { join '', @$_ } list2kv map { - $_->{start} % $hd->cylinder_size() == 0 or die "partition not at beginning of cylinder"; + $_->{start} % $hd->cylinder_size == 0 or die "partition not at beginning of cylinder"; # $csize += $_->{size} if $_->{type} != 5; # $wdsize += $_->{size} if $_->{type} == 5; $_->{flags} |= 0x10 if $_->{mntpoint} eq '/'; $_->{flags} |= 0x01 if partition_table::isSwap($_); - local $_->{start_cylinder} = $_->{start} / $hd->cylinder_size() - $sector; + local $_->{start_cylinder} = $_->{start} / $hd->cylinder_size - $sector; pack($format1, @$_{@$fields1}), pack($format2, @$_{@$fields2}); } @$pt; # $csize == $wdsize or die "partitions are not using whole disk space"; @@ -192,7 +192,7 @@ sub clear_raw { type => 5, #- the whole disk type. flags => 0, start_cylinder => 0, - size => $hd->{geom}{cylinders} * $hd->cylinder_size(), + size => $hd->{geom}{cylinders} * $hd->cylinder_size, }; $pt; |