summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-01-22 13:02:08 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-01-22 13:02:08 +0000
commit2e7ee11f9e069cffaf1d4f8f98d98810a20d7e43 (patch)
tree189f74c2266261014873326ca8be6b1bf3519d5f
parent476375d5d216333e231d796bc3e9dc58befe82d1 (diff)
downloaddrakx-backup-do-not-use-2e7ee11f9e069cffaf1d4f8f98d98810a20d7e43.tar
drakx-backup-do-not-use-2e7ee11f9e069cffaf1d4f8f98d98810a20d7e43.tar.gz
drakx-backup-do-not-use-2e7ee11f9e069cffaf1d4f8f98d98810a20d7e43.tar.bz2
drakx-backup-do-not-use-2e7ee11f9e069cffaf1d4f8f98d98810a20d7e43.tar.xz
drakx-backup-do-not-use-2e7ee11f9e069cffaf1d4f8f98d98810a20d7e43.zip
- 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)
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/install/NEWS3
-rw-r--r--perl-install/partition_table.pm2
3 files changed, 8 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index dd8ced8f6..9f2014ca7 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.6.6 - 22 January 2008
- bootloader-config:
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index dffcb15ad..5e738afe5 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- look for LVM PV on non partitioned disk before looking for DOS
+ partition_table (esp. for lilo which puts the DOS magic)
+
Version 10.6.7 - 22 January 2008
- add xkb/symbols/inet (which is now needed by default for pc105)
diff --git a/perl-install/partition_table.pm b/perl-install/partition_table.pm
index 752fe7088..7fec13559 100644
--- a/perl-install/partition_table.pm
+++ b/perl-install/partition_table.pm
@@ -254,7 +254,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};