summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClaudio Matsuoka <claudio@mandriva.com>2010-01-14 20:45:04 +0000
committerClaudio Matsuoka <claudio@mandriva.com>2010-01-14 20:45:04 +0000
commit3fa84dd5f1e175fafb57585edc20c7241b622337 (patch)
treeeb6bf35a71bbcfa35a58edcae273cc94a1729738
parentdd29aae8bf87e6cefe4d7a7a977a7cf7dabafa4b (diff)
downloaddrakx-backup-do-not-use-3fa84dd5f1e175fafb57585edc20c7241b622337.tar
drakx-backup-do-not-use-3fa84dd5f1e175fafb57585edc20c7241b622337.tar.gz
drakx-backup-do-not-use-3fa84dd5f1e175fafb57585edc20c7241b622337.tar.bz2
drakx-backup-do-not-use-3fa84dd5f1e175fafb57585edc20c7241b622337.tar.xz
drakx-backup-do-not-use-3fa84dd5f1e175fafb57585edc20c7241b622337.zip
fix detecting pcmcia serial devices
-rw-r--r--perl-install/NEWS4
-rw-r--r--perl-install/detect_devices.pm4
-rw-r--r--perl-install/install/NEWS4
3 files changed, 10 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 67c594f71..10cfc4709 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,9 @@
+Version 12.77.3 - 14 January 2010
+
- fix creating devices
(really "fix handling hdX/sdX devices (#53107)")
+- detect_devices:
+ o fix detecting pcmcia serial devices
Version 12.77.2 - 30 November 2009
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index a8c9d311c..74c860f02 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -905,8 +905,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 633eb6b5f..ea7f2b7c0 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,7 +1,11 @@
+Version 12.77.1 - 14 January 2010
+
- do not offer to upgrade/install in restore mode
- locale settings
o fix configuring ibus (#56130, #56311)
o install 'ibus-qt4' if configuring ibus under KDE4 (#56311)
+- detect_devices:
+ o fix detecting pcmcia serial devices
Version 12.77 - 30 October 2009