summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2011-12-21 13:20:45 +0000
committerThierry Vignaud <tv@mageia.org>2011-12-21 13:20:45 +0000
commitce1399fd5e10d908e915956fc2edf75e6a6eb178 (patch)
treeb3df823e79535feebfb5ea390b780607b7a06cd0
parent61c4b7926bef9d3198e89dbd07cc4b5dbb7ef263 (diff)
downloaddrakx-ce1399fd5e10d908e915956fc2edf75e6a6eb178.tar
drakx-ce1399fd5e10d908e915956fc2edf75e6a6eb178.tar.gz
drakx-ce1399fd5e10d908e915956fc2edf75e6a6eb178.tar.bz2
drakx-ce1399fd5e10d908e915956fc2edf75e6a6eb178.tar.xz
drakx-ce1399fd5e10d908e915956fc2edf75e6a6eb178.zip
(write_partitions,open_part,active_dm) call udevadm in installer too
-rw-r--r--perl-install/diskdrake/interactive.pm2
-rw-r--r--perl-install/fs/dmcrypt.pm4
-rw-r--r--perl-install/install/NEWS1
3 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 600079cd5..870f1b744 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -1245,7 +1245,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') unless $::isInstall;
+ run_program::run('udevadm', 'settle');
1;
}
diff --git a/perl-install/fs/dmcrypt.pm b/perl-install/fs/dmcrypt.pm
index 0b9c58337..3d6f790d4 100644
--- a/perl-install/fs/dmcrypt.pm
+++ b/perl-install/fs/dmcrypt.pm
@@ -78,7 +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;
+ run_program::run('udevadm', 'settle');
my $active_dmcrypt = _parse_dmsetup_table($part->{dm_name},
run_program::get_stdout('dmsetup', 'table', $part->{dm_name}));
@@ -148,7 +148,7 @@ sub _parse_dmsetup_table {
}
sub active_dm() {
- run_program::run('udevadm', 'settle') unless $::isInstall;
+ run_program::run('udevadm', 'settle');
map {
my $name = s/(.*?):\s*// && $1;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 341b89bba..dff18bed5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- call udevadm in installer too
- do not hardcode systemd default through kernel command line, it
should be easily overridable by just picking the proper init package