From 9b92cf5f07d0857931e601fe4f67a90803b09ca3 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mandriva.org>
Date: Wed, 18 Nov 2009 14:20:25 +0000
Subject: (entry) fix handling hdX/sdX devices (#53107) (backported from trunk)

---
 perl-install/NEWS       | 2 ++
 perl-install/devices.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/perl-install/NEWS b/perl-install/NEWS
index c0f783244..afd265d49 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,7 @@
 - partitioning wizard:
   o only display Help button in install
+- diskdrake:
+  o fix handling hdX/sdX devices (#53107)
 - display_help: handle window.close() events (#55099)
 
 Version 12.77 - 30 October 2009
diff --git a/perl-install/devices.pm b/perl-install/devices.pm
index 26c7599a0..6168973a8 100644
--- a/perl-install/devices.pm
+++ b/perl-install/devices.pm
@@ -158,7 +158,7 @@ sub entry {
 	} elsif (-e "/sys/block/$_/dev") {
 	    $sysdev = "/sys/block/$_/dev";
 	    $type = c::S_IFBLK();
-        } elsif (/(.+)(\d+)$/ && -e "/sys/block/$1/$2/dev") {
+        } elsif (/^(.+)(\d+)$/ && -e "/sys/block/$1/$_/dev") {
 	    $sysdev = "/sys/block/$_/dev";
 	    $type = c::S_IFBLK();
         }
-- 
cgit v1.2.1