From 89ae8e4d380d98463561887607e5e1b5ec0fb5a7 Mon Sep 17 00:00:00 2001 From: Pascal Rigaux Date: Tue, 22 Jan 2008 13:01:30 +0000 Subject: - look for LVM PV on non partitioned disk before looking for DOS partition_table (esp. for lilo which puts the DOS magic) --- perl-install/NEWS | 4 ++++ perl-install/install/NEWS | 2 ++ perl-install/partition_table.pm | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/perl-install/NEWS b/perl-install/NEWS index e9d0bf737..0110f5061 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,7 @@ +- bootloader-config, diskdrake: + o look for LVM PV on non partitioned disk before looking for DOS + partition_table (esp. for lilo which puts the DOS magic) + Version 10.4.239.1 - 12 January 2008, by Thierry Vignaud - localedrake: o restrict the proposed input-methods for each language diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 77ee6461c..622502aab 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- 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 (ie PV on non partitioned drive) - restrict the proposed input-methods for each language diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm index 590365536..b350ad9ae 100644 --- a/perl-install/partition_table.pm +++ b/perl-install/partition_table.pm @@ -256,7 +256,7 @@ sub read_primary { #- but other sectors (typically for extended partition ones) have to match this type! my @parttype = ( if_(arch() =~ /^ia64/, 'gpt'), - arch() =~ /^sparc/ ? ('sun', 'bsd') : ('dos', 'lvm', 'bsd', 'sun', 'mac'), + arch() =~ /^sparc/ ? ('sun', 'bsd') : ('lvm', 'dos', 'bsd', 'sun', 'mac'), ); foreach ('empty', @parttype, 'unknown') { /unknown/ and die "unknown partition table format on disk " . $hd->{file}; -- cgit v1.2.1