summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-04-14 07:07:50 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-04-14 07:07:50 +0000
commite0dfaa6ea562edd9ec91c8d16b0fa7ad0c6e9d43 (patch)
treeaac4832f60d3abc052e29b8f4234fcd4fe15b1ed
parente7fac9ec17450b9470b27d70b9b7ba5fb3c4aa6d (diff)
downloaddrakx-e0dfaa6ea562edd9ec91c8d16b0fa7ad0c6e9d43.tar
drakx-e0dfaa6ea562edd9ec91c8d16b0fa7ad0c6e9d43.tar.gz
drakx-e0dfaa6ea562edd9ec91c8d16b0fa7ad0c6e9d43.tar.bz2
drakx-e0dfaa6ea562edd9ec91c8d16b0fa7ad0c6e9d43.tar.xz
drakx-e0dfaa6ea562edd9ec91c8d16b0fa7ad0c6e9d43.zip
- diskdrake:
o ensure no "division by zero" runtime error (#34931)
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/interactive.pm2
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index a1cb6c5ef..5654c77dc 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- diskdrake:
+ o ensure no "division by zero" runtime error (#34931)
- drakupdate_fstab:
o only add formatted partitions in fstab (or else it will make
subsequent boot fail)
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 73bd41222..f61f8d316 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -1201,7 +1201,7 @@ sub format_part_info {
$info .= sprintf " (%s%%)", int 100 * $part->{size} / $hd->{totalsectors} if $hd->{totalsectors};
$info .= N(", %s sectors", $part->{size}) if $::expert;
$info .= "\n";
- $info .= N("Cylinder %d to %d\n", $part->{start} / $hd->cylinder_size, ($part->{start} + $part->{size} - 1) / $hd->cylinder_size) if ($::expert || isEmpty($part)) && !isSpecial($part) && !isLVM($hd);
+ $info .= N("Cylinder %d to %d\n", $part->{start} / $hd->cylinder_size, ($part->{start} + $part->{size} - 1) / $hd->cylinder_size) if ($::expert || isEmpty($part)) && !isSpecial($part) && !isLVM($hd) && $hd->cylinder_size;
$info .= N("Number of logical extents: %d\n", $part->{size} / $hd->cylinder_size) if $::expert && isLVM($hd);
$info .= N("Formatted\n") if $part->{isFormatted};
$info .= N("Not formatted\n") if !$part->{isFormatted} && $part->{notFormatted};