summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2004-02-18 11:17:56 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2004-02-18 11:17:56 +0000
commit24810baa48242f9afcde0aa8cfdecb8da609e1fc (patch)
tree98981e8799364bf6269067010ffc6bb4582a3504
parentdda88c87469bf52b97c22bd5c19b54202a7e1e67 (diff)
downloaddrakx-backup-do-not-use-24810baa48242f9afcde0aa8cfdecb8da609e1fc.tar
drakx-backup-do-not-use-24810baa48242f9afcde0aa8cfdecb8da609e1fc.tar.gz
drakx-backup-do-not-use-24810baa48242f9afcde0aa8cfdecb8da609e1fc.tar.bz2
drakx-backup-do-not-use-24810baa48242f9afcde0aa8cfdecb8da609e1fc.tar.xz
drakx-backup-do-not-use-24810baa48242f9afcde0aa8cfdecb8da609e1fc.zip
don't log insmod errors on tty5, rather on tty3+ddebug.log as normal log
-rw-r--r--perl-install/modules.pm15
1 files changed, 11 insertions, 4 deletions
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;