summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-28 17:37:38 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-28 17:37:38 +0000
commit2806a979409cf934ae8c31038be2cf20de9fb041 (patch)
treef3661e938de6ef7bbef24eda1c95e6d8beb2cb07
parent365c5cb12e4b27869373d80b27037ca7a203303e (diff)
downloaddrakx-2806a979409cf934ae8c31038be2cf20de9fb041.tar
drakx-2806a979409cf934ae8c31038be2cf20de9fb041.tar.gz
drakx-2806a979409cf934ae8c31038be2cf20de9fb041.tar.bz2
drakx-2806a979409cf934ae8c31038be2cf20de9fb041.tar.xz
drakx-2806a979409cf934ae8c31038be2cf20de9fb041.zip
- fix detecting existing LVMs (#31228)
(regression introduced in 10.4.204 (?)) (backported from HEAD)
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/partition_table/lvm.pm1
-rw-r--r--perl-install/partition_table/readonly.pm1
3 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 622502aab..094746f7e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- fix detecting existing LVMs (#31228)
+ (regression introduced in 10.4.204 (?))
- look for LVM PV on non partitioned disk before looking for DOS
partition_table (esp. for lilo which puts the DOS magic)
- don't check /proc/partitions for a partition_table::lvm
diff --git a/perl-install/partition_table/lvm.pm b/perl-install/partition_table/lvm.pm
index 5378d0bb2..731b470ef 100644
--- a/perl-install/partition_table/lvm.pm
+++ b/perl-install/partition_table/lvm.pm
@@ -10,7 +10,6 @@ our @ISA = qw(partition_table::readonly);
use common;
use partition_table::readonly;
use fs::type;
-use lvm;
sub _parts {
my ($hd) = @_;
diff --git a/perl-install/partition_table/readonly.pm b/perl-install/partition_table/readonly.pm
index ec4e5cc49..f36b60e4a 100644
--- a/perl-install/partition_table/readonly.pm
+++ b/perl-install/partition_table/readonly.pm
@@ -8,7 +8,6 @@ our @ISA = qw(partition_table::raw);
use common;
use partition_table::raw;
use fs::type;
-use lvm;
sub initialize {
my ($class, $hd, $parts) = @_;