diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-03-23 19:50:35 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-03-23 19:50:35 +0000 |
| commit | f4bc86bc94aeeeffb8a82b16b38b760590b80bdf (patch) | |
| tree | b5a904657487cd5dfec16ca195ee72b9098a086f /perl-install/partition_table | |
| parent | cb09d79bc963f95780d214aa12e695d8f9e338e2 (diff) | |
| download | drakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.tar drakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.tar.gz drakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.tar.bz2 drakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.tar.xz drakx-f4bc86bc94aeeeffb8a82b16b38b760590b80bdf.zip | |
perl_checker cleanups
Diffstat (limited to 'perl-install/partition_table')
| -rw-r--r-- | perl-install/partition_table/bsd.pm | 1 | ||||
| -rw-r--r-- | perl-install/partition_table/dos.pm | 6 | ||||
| -rw-r--r-- | perl-install/partition_table/raw.pm | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/perl-install/partition_table/bsd.pm b/perl-install/partition_table/bsd.pm index f69cae97c..55e598e42 100644 --- a/perl-install/partition_table/bsd.pm +++ b/perl-install/partition_table/bsd.pm @@ -144,7 +144,6 @@ sub initialize { my ($class, $hd) = @_; $hd->{primary} = { raw => [ ({}) x $nb_primary ], info => info($hd) }; bless $hd, $class; -; } sub first_usable_sector { 2048 } diff --git a/perl-install/partition_table/dos.pm b/perl-install/partition_table/dos.pm index 2cd6fe311..59439e1d4 100644 --- a/perl-install/partition_table/dos.pm +++ b/perl-install/partition_table/dos.pm @@ -220,14 +220,14 @@ sub read_one { sysread $F, $tmp, length $magic or die "error reading magic number on disk $hd->{device}"; $tmp eq $magic or die "bad magic number on disk $hd->{device}"; - if(c::get_disk_type($hd->{file}) ne "msdos") { + if (c::get_disk_type($hd->{file}) ne "msdos") { # libparted may have ignored it because of overlapping partitions or other error # while it is actually a partition table. $hd->{fs_type_from_magic} and die "unpartitionned disk"; my $primary = partition_table::raw::pt_info_to_primary($hd, [ @pt ]); foreach my $i (@{$primary->{normal}}) { - if (($i->{active} && $i->{active} != 0x80) || - ($hd->{totalsectors} && $i->{start} > $hd->{totalsectors})) { + if ($i->{active} && $i->{active} != 0x80 || + $hd->{totalsectors} && $i->{start} > $hd->{totalsectors}) { die "Invalid DOS partition table"; } } diff --git a/perl-install/partition_table/raw.pm b/perl-install/partition_table/raw.pm index ed89595b3..0438fda5a 100644 --- a/perl-install/partition_table/raw.pm +++ b/perl-install/partition_table/raw.pm @@ -122,7 +122,7 @@ sub get_geometries { $geom{start} = 1; compute_nb_cylinders(\%geom, $total); $geom{totalcylinders} = $geom{cylinders}; - log::l("Fake geometry on ".$_->{file}.": heads=$geom{heads} sectors=$geom{sectors} cylinders=$geom{cylinders} start=$geom{start}"); + log::l("Fake geometry on " . $_->{file} . ": heads=$geom{heads} sectors=$geom{sectors} cylinders=$geom{cylinders} start=$geom{start}"); add2hash_($_, { totalsectors => $total, geom => \%geom }); 1; } elsif (my $h = get_geometry($_->{file})) { |