diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-06-03 05:25:01 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-06-03 05:25:01 +0000 |
| commit | 000bb3a58af6d150a486d10a78fbfe9f5bcf9a30 (patch) | |
| tree | 68d2ee194463a442bdc9deeb697a7b250ca3889b /perl-install/detect_devices.pm | |
| parent | e9588e4c1cd38f100e37173dc4e30788f18df5b2 (diff) | |
| download | drakx-backup-do-not-use-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.tar drakx-backup-do-not-use-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.tar.gz drakx-backup-do-not-use-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.tar.bz2 drakx-backup-do-not-use-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.tar.xz drakx-backup-do-not-use-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.zip | |
get rid of the few remaining $LD_LOADER
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 2b3e3ff4c..34541e024 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -814,9 +814,11 @@ sub tryWrite($) { } sub syslog() { - -r "/tmp/syslog" and return map { /<\d+>(.*)/ } cat_("/tmp/syslog"); - my $LD_LOADER = $ENV{LD_LOADER} || ""; - `$LD_LOADER /bin/dmesg`; + if (-r "/tmp/syslog") { + map { /<\d+>(.*)/ } cat_("/tmp/syslog"); + } else { + `/bin/dmesg`; + } } sub get_mac_model() { |