diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 07:21:04 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-07 07:21:04 +0000 |
| commit | 89e2c0f66b7aac23562cac0c22a3b71f388fe568 (patch) | |
| tree | 30cddc6802f479466a92af9e5b89a77c8139095f /perl-install/install2.pm | |
| parent | dd69bb2017f7dad5911f7117b7863f20baae83b1 (diff) | |
| download | drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.gz drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.bz2 drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.tar.xz drakx-89e2c0f66b7aac23562cac0c22a3b71f388fe568.zip | |
modules::mergein_conf() doesn't need to be given /etc/modules.conf
=> prepare for reading either modprobe.conf or modules.conf based on the running kernel version
Diffstat (limited to 'perl-install/install2.pm')
| -rw-r--r-- | perl-install/install2.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index 7ca1e9c17..b8f57432a 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -457,7 +457,7 @@ sub main { eval { spawnShell() }; modules::load_dependencies(($::testing ? ".." : "") . "/modules/modules.dep"); - modules::read_stage1_conf('/tmp/modules.conf'); + modules::mergein_conf_raw('/tmp/modules.conf'); modules::read_already_loaded(); #- done before auto_install is called to allow the -IP feature on auto_install file name |