From 32add8d1612f809a0185db584e0e3e9dd4794c8e Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 25 Feb 2000 12:33:38 +0000
Subject: no_comment

---
 docs/TODO                           | 8 +++++---
 perl-install/ChangeLog              | 7 +++++++
 perl-install/fsedit.pm              | 3 +--
 perl-install/partition_table_raw.pm | 2 +-
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/docs/TODO b/docs/TODO
index eab20a2c2..fdd8953d5 100644
--- a/docs/TODO
+++ b/docs/TODO
@@ -20,9 +20,6 @@ diskdrake should warn if nb_ide_parts > 63, nb_scsi_parts > 15
 
 RAID upgrades
 
-diskdrake and auto partitioning, may have the last creation of partition rejected,
-try to figure why?
-
 -features-------------------------------------------------------------------------------
 (NEED 7.1) auto-install for corporate, very important (need consolidation).
 
@@ -188,6 +185,7 @@ have a better time estimation of the remaining time in install packages
 
 (?) options in mkfs, progress bar when formatting
 
+(?) when some occur, partition must be unset isFormatted
 
 -hardware-------------------------------------------------------------------------------
 token ring is tr0 not eth0
@@ -460,3 +458,7 @@ peut en sortir. La seule solution est de red
 (done,pix)urpmi: handle many args on cmd-line
 
 (done,pix)fix any // in path to ftp server otherwise windobe server bug :(
+
+(done,pix)diskdrake and auto partitioning, may have the last creation of partition rejected,
+try to figure why?
+
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index c7154a2cb..0b88a7bbe 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,10 @@
+2000-02-25  Pixel  <pixel@mandrakesoft.com>
+
+	* partition_table_raw.pm (adjustEnd): more explicit error message
+
+	* fsedit.pm (allocatePartitions): fix a bug (size was getting too
+	big after each allocation) making adjustEnd cry
+
 2000-02-24  Pixel  <pixel@mandrakesoft.com>
 
 	* interactive_gtk.pm (new): added the "new" method to initialize
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 7e8fcf862..8f23f1795 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -263,10 +263,9 @@ sub allocatePartitions($$) {
 				$part = { start => $start, size => 0, maxsize => $size }, 
 				$hds, $to_add)) {
 		add($hd, $part, $hds);
+		$size -= $part->{size} + $part->{start} - $start;
 		$start = $part->{start} + $part->{size};
-		$size -= $part->{size};
 	    }
-	    $start = $_->{start} + $_->{size};
 	}
     }
 }
diff --git a/perl-install/partition_table_raw.pm b/perl-install/partition_table_raw.pm
index d1399f230..a6ccfdf2c 100644
--- a/perl-install/partition_table_raw.pm
+++ b/perl-install/partition_table_raw.pm
@@ -62,7 +62,7 @@ sub adjustEnd($$) {
     my $end = $part->{start} + $part->{size};
     my $end1 = round_down($end, cylinder_size($hd));
     my $end2 = round_up($end - ($hd->{geom}{heads} > 2 ? 2 : 1) * $hd->{geom}{sectors}, cylinder_size($hd));
-    $end2 <= $hd->{geom}{cylinders} * cylinder_size($hd) or die "adjustEnd go beyond end of device geometry";
+    $end2 <= $hd->{geom}{cylinders} * cylinder_size($hd) or die "adjustEnd go beyond end of device geometry ($end2 > $hd->{totalsectors})";
     $part->{size} = ($end1 - $part->{start} > cylinder_size($hd) ? $end1 : $end2) - $part->{start};
     $part->{size} > 0 or die "adjustEnd get a too small partition to handle correctly";
 }
-- 
cgit v1.2.1