summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-09-26 09:23:10 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-09-26 09:23:10 +0000
commit26377008f5e64754b0cacf80924d40a88753f2cc (patch)
treedd9ff073b721d302dfe090c3151a086ed3059895 /perl-install
parent82dbe80eef9f1ae5da732f7324d77bfed49ad5c9 (diff)
downloaddrakx-26377008f5e64754b0cacf80924d40a88753f2cc.tar
drakx-26377008f5e64754b0cacf80924d40a88753f2cc.tar.gz
drakx-26377008f5e64754b0cacf80924d40a88753f2cc.tar.bz2
drakx-26377008f5e64754b0cacf80924d40a88753f2cc.tar.xz
drakx-26377008f5e64754b0cacf80924d40a88753f2cc.zip
11.54.2
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/Makefile.config2
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/diskdrake/interactive.pm4
-rw-r--r--perl-install/fsedit.pm5
4 files changed, 12 insertions, 1 deletions
diff --git a/perl-install/Makefile.config b/perl-install/Makefile.config
index 2ad36e87c..ea5b6ddef 100644
--- a/perl-install/Makefile.config
+++ b/perl-install/Makefile.config
@@ -1,5 +1,5 @@
# -*- Makefile -*-
-VERSION:=11.54.1
+VERSION:=11.54.2
SUDO = sudo
TMPDIR = /tmp
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 90ed78884..148f6d77f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+Version 11.54.2 - 26 September 2008
+
- bootloader-config:
o --action migrate-to-uuids: be more precautious when modifying /etc/fstab
(especially do not drop unrecognised entries) (#43548)
diff --git a/perl-install/diskdrake/interactive.pm b/perl-install/diskdrake/interactive.pm
index 9c2c6750c..c07e46aab 100644
--- a/perl-install/diskdrake/interactive.pm
+++ b/perl-install/diskdrake/interactive.pm
@@ -834,6 +834,10 @@ sub dmcrypt_open {
delete $part->{dmcrypt_key};
die(($? >> 8) == 255 ? N("Invalid key") : $@);
}
+
+ if (isRawLVM($part)) {
+ push @{$all_hds->{lvms}}, fsedit::scan_pvs($part);
+ }
}
sub Add2RAID {
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index d0d9b6a2e..bd4831b6b 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -90,6 +90,11 @@ sub dmcrypts {
sub lvms {
my ($all_hds) = @_;
my @pvs = grep { isRawLVM($_) } fs::get::fstab($all_hds) or return;
+ scan_pvs(@pvs);
+}
+
+sub scan_pvs {
+ my (@pvs) = @_;
log::l("looking for vgs in " . join(' ', map { $_->{device} } @pvs));