diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-04-21 07:11:12 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-04-21 07:11:12 +0000 |
| commit | 705bb01dbafd020971ead18c9bcde14bdbc0a590 (patch) | |
| tree | a9ed205327295c8380c32454f79cb65f1f6013b0 | |
| parent | b7b8ae3abe6bbc33095a9f354a8915cc8b6dd153 (diff) | |
| download | drakx-705bb01dbafd020971ead18c9bcde14bdbc0a590.tar drakx-705bb01dbafd020971ead18c9bcde14bdbc0a590.tar.gz drakx-705bb01dbafd020971ead18c9bcde14bdbc0a590.tar.bz2 drakx-705bb01dbafd020971ead18c9bcde14bdbc0a590.tar.xz drakx-705bb01dbafd020971ead18c9bcde14bdbc0a590.zip | |
do not run udevadm in install mode
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/fs/dmcrypt.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 88997ee63..56ff98934 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -1157,7 +1157,7 @@ sub write_partitions { partition_table::write($hd) if !$::testing; check_rebootNeeded($in, $hd) if !$b_skip_check_rebootNeeded; # fix resizing's failures due to udev's race when writing the partition table - run_program::run('udevadm', 'settle'); + run_program::run('udevadm', 'settle') unless $::isInstall; 1; } diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm index fccc9bf0a..d79464c35 100644 --- a/perl-install/fs/dmcrypt.pm +++ b/perl-install/fs/dmcrypt.pm @@ -144,7 +144,7 @@ sub _parse_dmsetup_table { } sub active_dm() { - run_program::run('udevadm', 'settle'); + run_program::run('udevadm', 'settle') unless $::isInstall; map { my $name = s/(.*?):\s*// && $1; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 8c9aeae8f..a69890b96 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- do not run udevadm in install mode + Version 12.29 - 21 April 2009 - do not log perl warnings about missing/not-yet-installed locales |