From 5ed323fc9a6c7e36a81242fa4a104ba3ea514339 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 30 Jul 1999 12:58:11 +0000
Subject: no_comment

---
 perl-install/fsedit.pm          | 4 ++++
 perl-install/partition_table.pm | 5 +++++
 2 files changed, 9 insertions(+)

diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index 5269ea25e..ad73e45c8 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -128,6 +128,10 @@ sub add($$$) {
       ($part->{mntpoint} = 'swap') :
       check_mntpoint($part->{mntpoint}, $hds);
 
+    $part->{mntpoint} eq '/boot' &&
+      $part->{start} + $part->{size} >= 1024 * partition_table::cylinder_size($hd) and
+	die "/boot on cylinder > 1024";
+
     partition_table::add($hd, $part);
 }
 
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index a9f20cd10..8ea4744bc 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -276,6 +276,11 @@ sub remove($$) {
 	    %{$last->{extended}} = $_->{extended} ? %{$_->{extended}} : ();
 	    splice(@{$hd->{extended}}, $i, 1);
 	    
+	    unless (@{$hd->{extended}}) {
+		%{$hd->{primary}->{extended}} = ();
+		delete $hd->{primary}->{extended};
+	    }
+
 	    return $hd->{isDirty} = $hd->{needKernelReread} = 1;
 	}
 	$last = $_;
-- 
cgit v1.2.1