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 | |
| parent | e9588e4c1cd38f100e37173dc4e30788f18df5b2 (diff) | |
| download | drakx-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.tar drakx-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.tar.gz drakx-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.tar.bz2 drakx-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.tar.xz drakx-000bb3a58af6d150a486d10a78fbfe9f5bcf9a30.zip | |
get rid of the few remaining $LD_LOADER
| -rw-r--r-- | perl-install/any.pm | 4 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 8 | ||||
| -rw-r--r-- | perl-install/lang.pm | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index e3f018641..b5fd95ec9 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -876,8 +876,8 @@ sub report_bug { join '', map { chomp; "$_\n" } header("lspci"), detect_devices::stringlist(), header("pci_devices"), cat_("/proc/bus/pci/devices"), - header("dmidecode"), `$ENV{LD_LOADER} dmidecode`, - header("fdisk"), arch() =~ /ppc/ ? `$ENV{LD_LOADER} pdisk -l` : `$ENV{LD_LOADER} fdisk -l`, + header("dmidecode"), `dmidecode`, + header("fdisk"), arch() =~ /ppc/ ? `pdisk -l` : `fdisk -l`, header("scsi"), cat_("/proc/scsi/scsi"), header("/sys/bus/scsi/devices"), `ls -l /sys/bus/scsi/devices`, header("lsmod"), cat_("/proc/modules"), 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() { diff --git a/perl-install/lang.pm b/perl-install/lang.pm index 91bc0147e..ff6ead5e4 100644 --- a/perl-install/lang.pm +++ b/perl-install/lang.pm @@ -1289,8 +1289,7 @@ sub load_console_font { my ($name, $sfm, $acm) = l2console_font($locale, 1); require run_program; - run_program::run(if_($ENV{LD_LOADER}, $ENV{LD_LOADER}), - 'consolechars', '-v', '-f', $name || 'lat0-16', + run_program::run('consolechars', '-v', '-f', $name || 'lat0-16', if_($sfm, '-u', $sfm), if_($acm, '-m', $acm)); } |