diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2010-04-30 16:46:24 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2010-04-30 16:46:24 +0000 |
| commit | 6945dca19a246e22f88ec2196d75bc8d3bad2f80 (patch) | |
| tree | 511fb4e1c776465faa7d0c2f1d7d072504df6a1c | |
| parent | 87428a2825541d817474bd4101d22816bc7d5064 (diff) | |
| download | drakx-backup-do-not-use-6945dca19a246e22f88ec2196d75bc8d3bad2f80.tar drakx-backup-do-not-use-6945dca19a246e22f88ec2196d75bc8d3bad2f80.tar.gz drakx-backup-do-not-use-6945dca19a246e22f88ec2196d75bc8d3bad2f80.tar.bz2 drakx-backup-do-not-use-6945dca19a246e22f88ec2196d75bc8d3bad2f80.tar.xz drakx-backup-do-not-use-6945dca19a246e22f88ec2196d75bc8d3bad2f80.zip | |
Move udevadm settle in dmcrypt_open
| -rw-r--r-- | perl-install/diskdrake/interactive.pm | 1 | ||||
| -rw-r--r-- | perl-install/fs/dmcrypt.pm | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm index 5d25312d2..a1e2f345f 100644 --- a/perl-install/diskdrake/interactive.pm +++ b/perl-install/diskdrake/interactive.pm @@ -569,7 +569,6 @@ First remove a primary partition and create an extended partition.")); } $p->{isFormatted} = 0; #- force format; # Wait for the newly created device to appear before formatting it - run_program::run('udevadm', 'settle') unless $::isInstall; my ($_w, $wait_message) = $in->wait_message_with_progress_bar; fs::format::part($all_hds, $p, $wait_message) unless isRawLVM($p); } diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm index a831564ec..0b9c58337 100644 --- a/perl-install/fs/dmcrypt.pm +++ b/perl-install/fs/dmcrypt.pm @@ -78,6 +78,7 @@ sub open_part { _run_or_die('luksOpen', devices::make($part->{device}), $part->{dm_name}, '--key-file', $_[0]); }); + run_program::run('udevadm', 'settle') unless $::isInstall; my $active_dmcrypt = _parse_dmsetup_table($part->{dm_name}, run_program::get_stdout('dmsetup', 'table', $part->{dm_name})); |