diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-09-07 07:07:52 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-09-07 07:07:52 +0000 |
| commit | ce0a1b887671ac54480bb133b4fb5ae23c333de7 (patch) | |
| tree | c0e53aadce821aa211e5560c2a19a2aa00b66b93 | |
| parent | 71707fee88533f6bc9e97028c1b0497a69801d26 (diff) | |
| download | drakx-ce0a1b887671ac54480bb133b4fb5ae23c333de7.tar drakx-ce0a1b887671ac54480bb133b4fb5ae23c333de7.tar.gz drakx-ce0a1b887671ac54480bb133b4fb5ae23c333de7.tar.bz2 drakx-ce0a1b887671ac54480bb133b4fb5ae23c333de7.tar.xz drakx-ce0a1b887671ac54480bb133b4fb5ae23c333de7.zip | |
when installing on kernel 2.4, do generate a valid modprobe.conf anyway
| -rw-r--r-- | perl-install/modules/modprobe_conf.pm | 8 | ||||
| -rw-r--r-- | perl-install/modules/modules_conf.pm | 5 |
2 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/modules/modprobe_conf.pm b/perl-install/modules/modprobe_conf.pm index 2917e27be..b2a57717d 100644 --- a/perl-install/modules/modprobe_conf.pm +++ b/perl-install/modules/modprobe_conf.pm @@ -42,14 +42,18 @@ sub set_above { } } +sub create_from_old() { + #- use module-init-tools script + run_program::rooted($::prefix, "/sbin/generate-modprobe.conf", ">", file()); +} + sub read { my ($type, $o_file) = @_; my $file = $o_file || do { my $f = $::prefix . file(); if (!-e $f && -e "$::prefix/etc/modules.conf") { - #- use module-init-tools script - run_program::rooted($::prefix, "/sbin/generate-modprobe.conf", ">", file()); + create_from_old(); } $f; }; diff --git a/perl-install/modules/modules_conf.pm b/perl-install/modules/modules_conf.pm index ed310c2d4..afcf08b35 100644 --- a/perl-install/modules/modules_conf.pm +++ b/perl-install/modules/modules_conf.pm @@ -60,6 +60,11 @@ sub write { }; modules::any_conf::write($conf, $file); + + if ($::isInstall) { + require modules::modprobe_conf; + modules::modprobe_conf::create_from_old(); + } } 1; |