summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-05-29 10:56:19 +0200
committerThomas Backlund <tmb@mageia.org>2015-05-29 10:56:19 +0200
commitf3c5ce01ee71ba2b210ea4a5d4447232ae1d2fe9 (patch)
tree6e07bc7a41c7e3e18f34ab4d9be33577ac30c151
parentb0631ad14f65a2bc83449099e59f0654a151a291 (diff)
downloaddrakx-f3c5ce01ee71ba2b210ea4a5d4447232ae1d2fe9.tar
drakx-f3c5ce01ee71ba2b210ea4a5d4447232ae1d2fe9.tar.gz
drakx-f3c5ce01ee71ba2b210ea4a5d4447232ae1d2fe9.tar.bz2
drakx-f3c5ce01ee71ba2b210ea4a5d4447232ae1d2fe9.tar.xz
drakx-f3c5ce01ee71ba2b210ea4a5d4447232ae1d2fe9.zip
run udevadm settle after actions that trigger device reload (Martin Whitaker, mga#15999)
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/fsedit.pm3
-rw-r--r--perl-install/install/NEWS1
3 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 13974e78a..2803b8fb0 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- diskdrake:
o ignore special 'Packard_Bell' and 'Push_Button_Reset' partitions (mga#15999)
+ o run udevadm settle after actions that trigger device reload (mga#15999)
- harddrake2:
o set min width for left panel (mga#16026)
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index edb2392ad..2e7e0d2d7 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -276,6 +276,9 @@ Do you agree to lose all the partitions?
my @parts = partition_table::get_normal_parts($hd);
+ # fix installer failures due to udev's race when run too early:
+ run_program::run('udevadm', 'settle');
+
# checking the magic of the filesystem, do not rely on pt_type
foreach (@parts) {
if (my $type = fs::type::type_subpart_from_magic($_)) {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 96ff4ad4d..0b0f954e4 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,5 +1,6 @@
- diskdrake:
o ignore special 'Packard_Bell' and 'Push_Button_Reset' partitions (mga#15999)
+ o run udevadm settle after actions that trigger device reload (mga#15999)
Version 16.101 - 25 May 2015