summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@gmail.com>2015-04-26 22:08:01 +0000
committerPascal Terjan <pterjan@gmail.com>2015-04-26 22:08:01 +0000
commit1e292ec66fcad786a80a29af904b06f2f62ca2db (patch)
tree5bd503459146042e9874ef5ee878e3617c124c79 /perl-install
parentb15e9859d769017892931f2c3889131372fb1f49 (diff)
downloaddrakx-1e292ec66fcad786a80a29af904b06f2f62ca2db.tar
drakx-1e292ec66fcad786a80a29af904b06f2f62ca2db.tar.gz
drakx-1e292ec66fcad786a80a29af904b06f2f62ca2db.tar.bz2
drakx-1e292ec66fcad786a80a29af904b06f2f62ca2db.tar.xz
drakx-1e292ec66fcad786a80a29af904b06f2f62ca2db.zip
Run vgchange before updating the list of LVMs, not after, and even if not
in install (should help with mga#7578).
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS3
-rw-r--r--perl-install/diskdrake/interactive.pm4
-rw-r--r--perl-install/install/NEWS3
3 files changed, 8 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 0bd41ae94..30a8773fd 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,6 @@
+- run vgchange before updating the list of LVMs, not after, and even if not
+ in install (should help with mga#7578).
+
Version 16.89 - 25 April 2015
- Ignore special partitions on mmc (mga#15759)
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index de5880b60..55059faaa 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -961,11 +961,11 @@ sub detect_lvms_on_dmcrypt {
require fs::dmcrypt;
my (undef, $tmp_file) = File::Temp::mkstemp('/tmp/crypttab.XXXXXXX');
fs::dmcrypt::save_crypttab_($all_hds, $tmp_file);
+ require lvm;
+ lvm::detect_during_install();
$all_hds->{lvms} = [ fsedit::lvms($all_hds) ];
fs::dmcrypt::read_crypttab_($all_hds, $tmp_file);
rm_rf($tmp_file);
- require lvm;
- lvm::detect_during_install() if $::isInstall;
}
sub Add2RAID {
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index a16d11b1a..349b2605a 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- run vgchange before updating the list of LVMs, not after, and even if not
+ in install (should help with mga#7578).
+
Version 16.89 - 25 April 2015
- Ignore special partitions on mmc (mga#15759)