summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-12-03 16:42:00 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-12-03 16:42:00 +0000
commit3080a2db1ef1c6c89b8b915795687f12b8ef2962 (patch)
tree0e6c5ca82abfb50f43dc7d0345e36f25e07f5e71
parentb3ee2185f78c8b1373eb5060a6b72a5be10b0600 (diff)
downloaddrakx-3080a2db1ef1c6c89b8b915795687f12b8ef2962.tar
drakx-3080a2db1ef1c6c89b8b915795687f12b8ef2962.tar.gz
drakx-3080a2db1ef1c6c89b8b915795687f12b8ef2962.tar.bz2
drakx-3080a2db1ef1c6c89b8b915795687f12b8ef2962.tar.xz
drakx-3080a2db1ef1c6c89b8b915795687f12b8ef2962.zip
- don't check /proc/partitions for a partition_table::lvm
(ie PV on non partitioned drive) (backport from trunk)
-rw-r--r--perl-install/fs/proc_partitions.pm3
-rw-r--r--perl-install/install/NEWS2
2 files changed, 5 insertions, 0 deletions
diff --git a/perl-install/fs/proc_partitions.pm b/perl-install/fs/proc_partitions.pm
index c0fc8efc4..566f9ee70 100644
--- a/perl-install/fs/proc_partitions.pm
+++ b/perl-install/fs/proc_partitions.pm
@@ -46,6 +46,9 @@ sub read {
sub compare {
my ($hd) = @_;
+ eval { $hd->isa('partition_table::lvm') } and return;
+
+
my @l1 = partition_table::get_normal_parts($hd);
my @l2 = grep { $_->{rootDevice} eq $hd->{device} } &read([$hd]);
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5c8119cf1..77ee6461c 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- don't check /proc/partitions for a partition_table::lvm
+ (ie PV on non partitioned drive)
- restrict the proposed input-methods for each language
- do propose "Suisse" after selecting french language (#34675)