From db6d38f52ab7043babff21a8772c5cb3f481dd37 Mon Sep 17 00:00:00 2001
From: Pascal Rigaux <pixel@mandriva.com>
Date: Sun, 5 Sep 1999 13:59:44 +0000
Subject: no_comment

---
 perl-install/detect_devices.pm | 9 +++------
 perl-install/modules.pm        | 7 ++++++-
 2 files changed, 9 insertions(+), 7 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm
index 47220af91..6330f0ea2 100644
--- a/perl-install/detect_devices.pm
+++ b/perl-install/detect_devices.pm
@@ -129,7 +129,7 @@ sub getDAC960() {
     @idi;
 }
 
-sub net2module {
+sub net2module() {
     my @modules = map { quotemeta first(split) } cat_("/proc/modules");
     my $modules = join '|', @modules;
     my $net     = join '|', @netdevices;
@@ -164,10 +164,7 @@ sub tryOpen($) {
     local *F;
     sysopen F, devices::make($_[0]), c::O_NONBLOCK() and \*F;
 }
-
 sub syslog {
-    my $file = "/var/log/dmesg";
-    -r $file or $file = "/tmp/syslog";
-    my @l = cat_($file);
-    @l ? @l : `dmesg`;
+    -r "/tmp/syslog" and return map { /<\d+>(.*)/ } cat_("/tmp/syslog");
+    `dmesg`
 }
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 594e07f9a..2117c580c 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -327,7 +327,12 @@ sub read_conf($;$) {
 
 sub write_conf {
     my ($file) = @_;
-    my (undef, %written) = read_conf($file);
+    my %written = read_conf($file);
+
+    my %net = detect_devices::net2module();
+    while (my ($k, $v) = each %net) {
+	$conf{$k}{alias} ||= $v;
+    }
 
     local *F;
     open F, ">> $file" or die("cannot write module config file $file: $!\n");
-- 
cgit v1.2.1