From 18a5572ee8e3850f1d1f928d43d2e1799594dbd9 Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Mon, 12 Mar 2001 15:18:34 +0000 Subject: 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. --- perl-install/detect_devices.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'perl-install/detect_devices.pm') 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 () { $serialprobe{$current{DEVICE}} = { %current } and %current = () if /^\s*$/ && $current{DEVICE}; -- cgit v1.2.1