summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2005-09-13 10:42:17 +0000
committerPascal Rigaux <pixel@mandriva.com>2005-09-13 10:42:17 +0000
commitd5dee1f5399b4310e7010f8fe9e3ff3856960f69 (patch)
tree1c4cf9a29f38e90e96d8d363c16c321ce177cb8a
parent3b095707824aa4ac965e92866b919334f8b103ec (diff)
downloaddrakx-d5dee1f5399b4310e7010f8fe9e3ff3856960f69.tar
drakx-d5dee1f5399b4310e7010f8fe9e3ff3856960f69.tar.gz
drakx-d5dee1f5399b4310e7010f8fe9e3ff3856960f69.tar.bz2
drakx-d5dee1f5399b4310e7010f8fe9e3ff3856960f69.tar.xz
drakx-d5dee1f5399b4310e7010f8fe9e3ff3856960f69.zip
- rename readBootloaderConfigBeforeInstall() to read_bootloader_config()
- call read_bootloader_config() after installing packages (for the case of grub scripts fixing the configuration, ie creating device.map and install.sh)
-rw-r--r--perl-install/install_steps.pm7
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index daedce231..45ce83191 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -369,7 +369,7 @@ sub upgrading_redhat() {
sub beforeInstallPackages {
my ($o) = @_;
- readBootloaderConfigBeforeInstall($o);
+ read_bootloader_config($o);
#- save these files in case of upgrade failure.
if ($o->{isUpgrade}) {
@@ -470,6 +470,8 @@ sub installPackages { #- complete REWORK, TODO and TOCHECK!
sub afterInstallPackages($) {
my ($o) = @_;
+ read_bootloader_config($o) if $o->{isUpgrade} && is_empty_hash_ref($o->{bootloader});
+
die N("Some important packages did not get installed properly.
Either your cdrom drive or your cdrom is defective.
Check the cdrom on an installed computer using \"rpm -qpl media/main/*.rpm\"
@@ -790,11 +792,12 @@ sub addUser {
}
#------------------------------------------------------------------------------
-sub readBootloaderConfigBeforeInstall {
+sub read_bootloader_config {
my ($o) = @_;
require bootloader;
eval { add2hash($o->{bootloader} ||= {}, bootloader::read($o->{all_hds})) };
+ $@ && $o->{isUpgrade} and log::l("read_bootloader_config failed: $@");
$o->{bootloader}{bootUnsafe} = 0 if $o->{bootloader}{boot}; #- when upgrading, do not ask where to install the bootloader (mbr vs boot partition)
}