summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-24 07:09:02 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-24 07:09:02 +0000
commit4ba199e6863ad0619651fb9540f763e1ab970102 (patch)
tree5d21d5c91770787073cb92452ff8a802d3c7414c
parent3868c10d10dc99670a90eddb48794e2b4ea2ca03 (diff)
downloaddrakx-4ba199e6863ad0619651fb9540f763e1ab970102.tar
drakx-4ba199e6863ad0619651fb9540f763e1ab970102.tar.gz
drakx-4ba199e6863ad0619651fb9540f763e1ab970102.tar.bz2
drakx-4ba199e6863ad0619651fb9540f763e1ab970102.tar.xz
drakx-4ba199e6863ad0619651fb9540f763e1ab970102.zip
- ignore /proc/partitions when "solaris" extended partition is present (#33866)
-rw-r--r--perl-install/fs/proc_partitions.pm6
-rw-r--r--perl-install/install/NEWS1
2 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/fs/proc_partitions.pm b/perl-install/fs/proc_partitions.pm
index 291c3bc25..c0fc8efc4 100644
--- a/perl-install/fs/proc_partitions.pm
+++ b/perl-install/fs/proc_partitions.pm
@@ -54,9 +54,13 @@ sub compare {
my ($len1, $len2) = (int(@l1) + $hd->{primary}{nb_special_empty}, int(@l2));
if ($len1 != $len2) {
- die sprintf(
+ if (find { $_->{pt_type} == 0xbf } @l1) {
+ log::l("not using /proc/partitions because of the presence of solaris extended partition"); #- cf #33866
+ } else {
+ die sprintf(
"/proc/partitions does not agree with drakx %d != %d:\n%s\n", $len1, $len2,
"/proc/partitions: " . join(", ", map { "$_->{device} ($_->{rootDevice})" } @l2));
+ }
}
$len2;
}
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 0e54a5cb5..78bafd41b 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- ignore /proc/partitions when "solaris" extended partition is present (#33866)
- translate the pkg summary when mdv-rpm-summary info is available
(for the "Details" mode when installing packages)
- ensure mdv-rpm-summary is installed first (if selected)