From 3080a2db1ef1c6c89b8b915795687f12b8ef2962 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Mon, 3 Dec 2007 16:42:00 +0000 Subject: - don't check /proc/partitions for a partition_table::lvm (ie PV on non partitioned drive) (backport from trunk) --- perl-install/fs/proc_partitions.pm | 3 +++ perl-install/install/NEWS | 2 ++ 2 files changed, 5 insertions(+) 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) -- cgit v1.2.1