From 24810baa48242f9afcde0aa8cfdecb8da609e1fc Mon Sep 17 00:00:00 2001
From: Guillaume Cottenceau <gc@mandriva.com>
Date: Wed, 18 Feb 2004 11:17:56 +0000
Subject: don't log insmod errors on tty5, rather on tty3+ddebug.log as normal
 log

---
 perl-install/modules.pm | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 52df91fad..9cc3bc39b 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -449,12 +449,19 @@ sub load_raw {
     extract_modules('/tmp', map { $_->[0] } @l);
     my @failed = grep {
 	my $m = '/tmp/' . name2file($_->[0]);
-	if (-e $m && run_program::run(["/usr/bin/insmod_", "insmod"], '2>', '/dev/tty5', $m, @{$_->[1]})) {
-	    unlink $m;
-	    '';
+	if (-e $m) {
+            my $stdout;
+            my $rc = run_program::run(["/usr/bin/insmod_", "insmod"], '2>', \$stdout, $m, @{$_->[1]});
+            log::l(chomp_($stdout)) if $stdout;
+            if ($rc) {
+                unlink $m;
+                '';
+            } else {
+                -e $m;
+            }
 	} else {
 	    log::l("missing module $_->[0]") if !-e $m;
-	    -e $m;
+            -e $m;
 	}
     } @l;
 
-- 
cgit v1.2.1