summaryrefslogtreecommitdiffstats
path: root/perl-install/detect_devices.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2001-03-12 15:18:34 +0000
committerFrancois Pons <fpons@mandriva.com>2001-03-12 15:18:34 +0000
commit18a5572ee8e3850f1d1f928d43d2e1799594dbd9 (patch)
treea8d7ff802b09c27d3cf3d169167fb4371836cba9 /perl-install/detect_devices.pm
parentece757a4920eb93a5eef727f710094c65b767118 (diff)
downloaddrakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar
drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar.gz
drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar.bz2
drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.tar.xz
drakx-18a5572ee8e3850f1d1f928d43d2e1799594dbd9.zip
fixed live update between GLIBC 2.1 and GLIBC 2.2. should work for other
combination but not tested. fixed locale usage and gtk environment interaction (added LOCPATH, GCONV_PATH and GTK_EXE_PREFIX). created LD_LOADER environment variable to keep track of right ELF loader to be used for the GLIBC used by the live update. added internal PATH to LD_LIBRARY_PATH as ELF loader only check this one and not PATH.
Diffstat (limited to 'perl-install/detect_devices.pm')
-rw-r--r--perl-install/detect_devices.pm4
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index d96e438d1..e0e95f465 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -243,7 +243,7 @@ sub tryWrite($) {
sub syslog {
-r "/tmp/syslog" and return map { /<\d+>(.*)/ } cat_("/tmp/syslog");
- `dmesg`;
+ `/bin/dmesg`;
}
sub hasSMP { c::detectSMP() }
@@ -328,7 +328,7 @@ sub probeSerialDevices {
print STDERR "Please wait while probing serial ports...\n";
#- start probing all serial ports... really faster than before ...
#- ... but still take some time :-)
- local *F; open F, "serial_probe 2>/dev/null |";
+ local *F; open F, "$ENV{LD_LOADER} serial_probe 2>/dev/null |";
local $_;
my %current = (); while (<F>) {
$serialprobe{$current{DEVICE}} = { %current } and %current = () if /^\s*$/ && $current{DEVICE};