summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-09-24 07:02:01 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-09-24 07:02:01 +0000
commit3868c10d10dc99670a90eddb48794e2b4ea2ca03 (patch)
treeb5b7e8e53f2a7cdc3576d79466c6b701c47f2617
parent448da6ea2ba0033ec09c66ef648c0d02a5e63bcc (diff)
downloaddrakx-3868c10d10dc99670a90eddb48794e2b4ea2ca03.tar
drakx-3868c10d10dc99670a90eddb48794e2b4ea2ca03.tar.gz
drakx-3868c10d10dc99670a90eddb48794e2b4ea2ca03.tar.bz2
drakx-3868c10d10dc99670a90eddb48794e2b4ea2ca03.tar.xz
drakx-3868c10d10dc99670a90eddb48794e2b4ea2ca03.zip
cleanup
-rw-r--r--perl-install/fs/proc_partitions.pm2
-rw-r--r--perl-install/fsedit.pm2
2 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/fs/proc_partitions.pm b/perl-install/fs/proc_partitions.pm
index 731797a19..291c3bc25 100644
--- a/perl-install/fs/proc_partitions.pm
+++ b/perl-install/fs/proc_partitions.pm
@@ -53,7 +53,7 @@ sub compare {
#- so add them for comparison
my ($len1, $len2) = (int(@l1) + $hd->{primary}{nb_special_empty}, int(@l2));
- if ($len1 != $len2 && arch() ne 'ppc') {
+ if ($len1 != $len2) {
die sprintf(
"/proc/partitions does not agree with drakx %d != %d:\n%s\n", $len1, $len2,
"/proc/partitions: " . join(", ", map { "$_->{device} ($_->{rootDevice})" } @l2));
diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index d1871dc48..bb6f3210a 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -203,7 +203,7 @@ sub get_hds {
die sprintf(q(bad dmraid (missing partition %s), you may try rebooting install with option "nodmraid"), $p->{device});
}
} else {
- fs::proc_partitions::compare($hd) if !detect_devices::is_xbox();
+ fs::proc_partitions::compare($hd) if !detect_devices::is_xbox() && arch() ne 'ppc';
}
}
} sub {