summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-22 13:01:30 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-22 13:01:30 +0000
commit89ae8e4d380d98463561887607e5e1b5ec0fb5a7 (patch)
treec3fb83cbd5552f4de1421c42c28557e7e34eecbe
parentc6fb4123f141c3feea58fb0430c62172c2ce69a0 (diff)
downloaddrakx-backup-do-not-use-89ae8e4d380d98463561887607e5e1b5ec0fb5a7.tar
drakx-backup-do-not-use-89ae8e4d380d98463561887607e5e1b5ec0fb5a7.tar.gz
drakx-backup-do-not-use-89ae8e4d380d98463561887607e5e1b5ec0fb5a7.tar.bz2
drakx-backup-do-not-use-89ae8e4d380d98463561887607e5e1b5ec0fb5a7.tar.xz
drakx-backup-do-not-use-89ae8e4d380d98463561887607e5e1b5ec0fb5a7.zip
- look for LVM PV on non partitioned disk before looking for DOS
partition_table (esp. for lilo which puts the DOS magic)
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/install/NEWS2
-rw-r--r--perl-install/partition_table.pm2
3 files changed, 7 insertions, 1 deletions
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};