fix resizing's faillures due to udev's race when writing the partition table

(deleting then recreating the nodes leaves a race window...)

2 files changed, 6 insertions, 3 deletions

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 48e4de971..316f15b2a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,4 +1,7 @@
 - centralize common textdomains in a single common place, thus ensuring they'll be binded (#31580)
+- diskdrake:
+  o fix resizing's faillures due to udev's race when writing the partition
+    table (deleting then recreating the nodes leaves a race window...)
 - service_harddrake (blino):
   o do not enable fglrx libraries when disabling fglrx...
   o really log when switching from fglrx to another driver
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 282492c36..906fda5f8 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -799,9 +799,6 @@ sub Resize {
 	    partition_table::adjust_local_extended($hd, $part);
 	    partition_table::adjust_main_extended($hd);
 	    write_partitions($in, $hd) or return if $write_partitions && %nice_resize;
-	    # fix resizing's faillures due to udev's race when writing the partition table
-	    # (deleting then recreating the nodes leaves a race window...)
-	    devices::make($part->{device});
 	}
 	1;
     };
@@ -1143,6 +1140,9 @@ sub write_partitions {
     $in->ask_okcancel(N("Read carefully!"), N("Partition table of drive %s is going to be written to disk!", $hd->{device}), 1) or return;
     partition_table::write($hd) if !$::testing;
     check_rebootNeeded($in, $hd) if !$b_skip_check_rebootNeeded;
+    # fix resizing's faillures due to udev's race when writing the partition table
+    # (deleting then recreating the nodes leaves a race window...)
+    run_program::run('udevsettle');
     1;
 }