From 7b070b17a4332d1c4d540b90cbae6c6b28db1fc7 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Mon, 8 Mar 2004 10:40:13 +0000
Subject: /proc/partitions parsing was broken for scsi cdroms using non-devfs
 names, and our 2.6 doesn't use devfs names in /proc/partitions... :'-(
 (bugzilla #8641)

---
 perl-install/fsedit.pm | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'perl-install/fsedit.pm')

diff --git a/perl-install/fsedit.pm b/perl-install/fsedit.pm
index a41a73a97..ec8f5a634 100644
--- a/perl-install/fsedit.pm
+++ b/perl-install/fsedit.pm
@@ -268,19 +268,18 @@ sub read_proc_partitions {
     my ($hds) = @_;
 
     my @all = devices::read_proc_partitions_raw();
-    my @parts = grep { $_->{dev} =~ /\d$/ } @all;
-    my @disks = grep { $_->{dev} !~ /\d$/ } @all;
+    my ($parts, $disks) = partition { $_->{dev} =~ /\d$/ && $_->{dev} !~ /^(sr|scd)/ } @all;
 
-    my $devfs_like = any { $_->{dev} =~ m|/disc$| } @disks;
+    my $devfs_like = any { $_->{dev} =~ m|/disc$| } @$disks;
 
     my %devfs2normal = map {
 	my (undef, $major, $minor) = devices::entry($_->{device});
-	my $disk = find { $_->{major} == $major && $_->{minor} == $minor } @disks;
+	my $disk = find { $_->{major} == $major && $_->{minor} == $minor } @$disks;
 	$disk->{dev} => $_->{device};
     } @$hds;
 
     my $prev_part;
-    foreach my $part (@parts) {
+    foreach my $part (@$parts) {
 	my $dev;
 	if ($devfs_like) {
 	    $dev = -e "/dev/$part->{dev}" ? $part->{dev} : sprintf("0x%x%02x", $part->{major}, $part->{minor});
@@ -300,7 +299,7 @@ sub read_proc_partitions {
 	$prev_part = $part;
 	delete $part->{dev}; # cleanup
     }
-    @parts;
+    @$parts;
 }
 
 sub all_hds {
-- 
cgit v1.2.1