diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 1999-09-05 13:59:44 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 1999-09-05 13:59:44 +0000 |
| commit | db6d38f52ab7043babff21a8772c5cb3f481dd37 (patch) | |
| tree | 5cdbcf9f7818729e81449322c089679a78b69d1e | |
| parent | b2dcc1f05939631e7583740a36f3c41c87235639 (diff) | |
| download | drakx-db6d38f52ab7043babff21a8772c5cb3f481dd37.tar drakx-db6d38f52ab7043babff21a8772c5cb3f481dd37.tar.gz drakx-db6d38f52ab7043babff21a8772c5cb3f481dd37.tar.bz2 drakx-db6d38f52ab7043babff21a8772c5cb3f481dd37.tar.xz drakx-db6d38f52ab7043babff21a8772c5cb3f481dd37.zip | |
no_comment
| -rw-r--r-- | perl-install/detect_devices.pm | 9 | ||||
| -rw-r--r-- | perl-install/modules.pm | 7 |
2 files changed, 9 insertions, 7 deletions
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"); |