From 480b568b1a5dac5bcab2590d81fdcad0a9f6f4f4 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Wed, 4 Jan 2017 11:31:45 +0000
Subject: Renumber existing partitions before adding a new one (mga#19935).

---
 perl-install/partition_table.pm | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 294e18052..5cd0ec228 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -360,15 +360,17 @@ sub will_tell_kernel {
 
 	push @{$hd->{'will_tell_kernel' . ($o_delay || '')} ||= []}, [ $action, @para ];
     }
-    if (!$o_delay) {
-	foreach my $delay ('delay_del', 'delay_add') {
-	    my $l = delete $hd->{"will_tell_kernel$delay"} or next;
-	    push @{$hd->{will_tell_kernel} ||= []}, @$l;
-	}
-    }
     $hd->{isDirty} = 1;
 }
 
+sub will_tell_kernel_delayed {
+    my ($hd) = @_;
+    foreach my $delay ('delay_del', 'delay_add') {
+	my $l = delete $hd->{"will_tell_kernel$delay"} or next;
+	push @{$hd->{will_tell_kernel} ||= []}, @$l;
+    }
+}
+
 sub tell_kernel {
     my ($hd, $tell_kernel) = @_;
 
@@ -493,6 +495,8 @@ sub remove {
 	assign_device_numbers($hd);
 
 	will_tell_kernel($hd, del => $part);
+	#- schedule renumbering after deleting the partition
+	will_tell_kernel_delayed($hd);
 	return 1;
     }
     0;
@@ -584,6 +588,8 @@ sub add {
     }
   success:
     assign_device_numbers($hd);
+    #- schedule renumbering before adding the partition
+    will_tell_kernel_delayed($hd);
     will_tell_kernel($hd, add => $part);
 }
 
-- 
cgit v1.2.1