diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-12-16 12:10:59 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-12-16 12:10:59 +0000 |
| commit | 3aa2bedc055efbbd8054e7c11dcfab88ea9dbd0b (patch) | |
| tree | 5ff6d0a93a32b76ee9fd5d2abcf451bd8486e7bf | |
| parent | abe973e7142c7e5b8c0a585f154b2315b5d4059c (diff) | |
| download | drakx-backup-do-not-use-3aa2bedc055efbbd8054e7c11dcfab88ea9dbd0b.tar drakx-backup-do-not-use-3aa2bedc055efbbd8054e7c11dcfab88ea9dbd0b.tar.gz drakx-backup-do-not-use-3aa2bedc055efbbd8054e7c11dcfab88ea9dbd0b.tar.bz2 drakx-backup-do-not-use-3aa2bedc055efbbd8054e7c11dcfab88ea9dbd0b.tar.xz drakx-backup-do-not-use-3aa2bedc055efbbd8054e7c11dcfab88ea9dbd0b.zip | |
when upgrading, merge existing modprobe.conf (and do it when /mnt is mounted, not before!)
| -rw-r--r-- | perl-install/install2.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps.pm | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index b0b6d2f29..19e8750d2 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -143,8 +143,6 @@ sub selectInstallClass { @{$o->{orderedSteps}} = uniq(map { $_ eq 'selectInstallClass' ? ($_, 'doPartitionDisks', 'formatPartitions') : $_; } @{$o->{orderedSteps}}); - - $o->{modules_conf}->merge_into(modules::any_conf->read); } } diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm index f47cc8c8a..dd4ab0370 100644 --- a/perl-install/install_steps.pm +++ b/perl-install/install_steps.pm @@ -371,6 +371,10 @@ sub beforeInstallPackages { read_bootloader_config($o); + if ($o->{isUpgrade}) { + $o->{modules_conf}->merge_into(modules::any_conf->read); + } + #- save these files in case of upgrade failure. if ($o->{isUpgrade}) { foreach (@filesToSaveForUpgrade) { |