summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2010-01-05 18:28:27 +0000
committerOlivier Blin <oblin@mandriva.com>2010-01-05 18:28:27 +0000
commit4a9333bc54357f299ec504264395044422d9cec4 (patch)
treeed97126dbda50c24d89e3b00047ae1e48dca83a0 /perl-install
parentc2d68dfae898c67cb109c4ffc81bad0cca556bd5 (diff)
downloaddrakx-backup-do-not-use-4a9333bc54357f299ec504264395044422d9cec4.tar
drakx-backup-do-not-use-4a9333bc54357f299ec504264395044422d9cec4.tar.gz
drakx-backup-do-not-use-4a9333bc54357f299ec504264395044422d9cec4.tar.bz2
drakx-backup-do-not-use-4a9333bc54357f299ec504264395044422d9cec4.tar.xz
drakx-backup-do-not-use-4a9333bc54357f299ec504264395044422d9cec4.zip
fix detecting pcmcia serial devices
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/detect_devices.pm4
-rw-r--r--perl-install/install/NEWS3
3 files changed, 7 insertions, 2 deletions
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