From 63ee6b158bf74b995d1e6ed294b6d4b3f3e95ca5 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Fri, 24 Dec 1999 00:26:22 +0000
Subject: no_comment

---
 perl-install/partition_table.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'perl-install/partition_table.pm')

diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index aa6912ab9..e8def5b18 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -436,8 +436,14 @@ sub remove($$) {
 	}
 	$i++;
     }
+
+    my ($first, $second, $third) = map { $_->{normal} } @{$hd->{extended} || []};
+    if ($third && $first eq $part) {
+	die "Can't handle removing hda5 when hda6 is not the second partition" if $second->{start} > $third->{start};
+    }      
+
     #- otherwise search it in extended partitions
-    foreach (@{$hd->{extended}}) {
+    foreach (@{$hd->{extended} || []}) {
 	$_->{normal} eq $part or next;
 
 	delete $_->{normal}; #- remove it
-- 
cgit v1.2.1