diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2005-12-16 12:10:29 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2005-12-16 12:10:29 +0000 |
| commit | f5b8ed98986104ebefeac832a37aa99867db1822 (patch) | |
| tree | 1e2f482297a048b06cd8aecdbcbc2dd0daa43745 | |
| parent | 97ad2e9492c703bac58ba8abfbb56894646d2e54 (diff) | |
| download | drakx-backup-do-not-use-f5b8ed98986104ebefeac832a37aa99867db1822.tar drakx-backup-do-not-use-f5b8ed98986104ebefeac832a37aa99867db1822.tar.gz drakx-backup-do-not-use-f5b8ed98986104ebefeac832a37aa99867db1822.tar.bz2 drakx-backup-do-not-use-f5b8ed98986104ebefeac832a37aa99867db1822.tar.xz drakx-backup-do-not-use-f5b8ed98986104ebefeac832a37aa99867db1822.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 95f4b925f..659bb718a 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 eba9df7a5..150657724 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) { |