summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2001-11-23 13:18:07 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2001-11-23 13:18:07 +0000
commita9d86c934b269074240b0c94cf957ea19e0b08b2 (patch)
treed78984d12aecd77e46ec29521802fdd474800b9a /perl-install
parent641bf8adcc4b1044e19a267ee71e0ca02f5a715c (diff)
downloaddrakx-backup-do-not-use-a9d86c934b269074240b0c94cf957ea19e0b08b2.tar
drakx-backup-do-not-use-a9d86c934b269074240b0c94cf957ea19e0b08b2.tar.gz
drakx-backup-do-not-use-a9d86c934b269074240b0c94cf957ea19e0b08b2.tar.bz2
drakx-backup-do-not-use-a9d86c934b269074240b0c94cf957ea19e0b08b2.tar.xz
drakx-backup-do-not-use-a9d86c934b269074240b0c94cf957ea19e0b08b2.zip
pcmcia: /var/run/stab is nor /var/lib/pcmcia/stab
yes it probably doesn't bring anything valuable but it's how life is :-)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/any.pm2
-rw-r--r--perl-install/detect_devices.pm4
2 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm
index ae73ddbf6..279bb3f21 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -846,7 +846,7 @@ sub report_bug {
header("scsi"), cat_("/proc/scsi/scsi"),
header("lsmod"), cat_("/proc/modules"),
header("cmdline"), cat_("/proc/cmdline"),
- header("pcmcia: stab"), cat_("/var/run/stab"),
+ header("pcmcia: stab"), cat_('/var/run/stab'), cat_('/var/lib/pcmcia/stab'),
header("usb"), cat_("/proc/bus/usb/devices"),
header("partitions"), cat_("/proc/partitions"),
header("cpuinfo"), cat_("/proc/cpuinfo"),
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 0fa9297aa..c5f7ff4a2 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -249,10 +249,10 @@ sub usb_probe {
}
sub pcmcia_probe {
- -e "/var/run/stab" or return ();
+ -e '/var/run/stab' || -e '/var/lib/pcmcia/stab' or return ();
my (@devs, $desc);
- foreach (cat_("/var/run/stab")) {
+ foreach (cat_('/var/run/stab'), cat_('/var/lib/pcmcia/stab')) {
if (/^Socket\s+\d+:\s+(.*)/) {
$desc = $1;
} else {