From 4a9333bc54357f299ec504264395044422d9cec4 Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Tue, 5 Jan 2010 18:28:27 +0000
Subject: fix detecting pcmcia serial devices

---
 perl-install/NEWS              | 2 ++
 perl-install/detect_devices.pm | 4 ++--
 perl-install/install/NEWS      | 3 +++
 3 files changed, 7 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/NEWS b/perl-install/NEWS
index 118377064..40970a032 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -3,6 +3,8 @@
 - diskdrake: show Ext4 instead of Ext3 in the gtk filesystems button box
 - harddrake:
   o fix detecting some cameras
+- detect_devices:
+  o fix detecting pcmcia serial devices
 
 Version 13.2 - 14 December 2009
 
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 62151b65a..b076187a4 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -906,8 +906,8 @@ sub pcmcia_probe() {
     map {
         my $dir = "$dev_dir/$_";
         my $get = sub { chomp_(cat_("$dir/$_[0]")) };
-        my $class_dev = first(glob_("$dir/tty*"));
-        my $device = $class_dev && get_sysfs_field_from_link($dir, basename($class_dev));
+        my $class_dev = first(glob_("$dir/tty/tty*"));
+        my $device = $class_dev && basename($class_dev);
         my $modalias = $get->('modalias');
         my $driver = get_sysfs_field_from_link($dir, 'driver');
         #- fallback on modalias result
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 42e26d9aa..32cabbcee 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,6 @@
+- detect_devices:
+  o fix detecting pcmcia serial devices
+
 Version 13.3 - 21 December 2009
 
 - mount points: reset unknown partitions types to default
-- 
cgit v1.2.1