summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2003-09-16 10:51:28 +0000
committerFrancois Pons <fpons@mandriva.com>2003-09-16 10:51:28 +0000
commit35b788a61e2e63a20666d236609b3f01813b91fc (patch)
treeca960453064f14f988d71c22f574a6b93be15e56 /perl-install/install2.pm
parente285ee8f5334033063745a132bd3016f1f6ddca1 (diff)
downloaddrakx-35b788a61e2e63a20666d236609b3f01813b91fc.tar
drakx-35b788a61e2e63a20666d236609b3f01813b91fc.tar.gz
drakx-35b788a61e2e63a20666d236609b3f01813b91fc.tar.bz2
drakx-35b788a61e2e63a20666d236609b3f01813b91fc.tar.xz
drakx-35b788a61e2e63a20666d236609b3f01813b91fc.zip
disable recovery mode if recovery.cfg file has not been read successfully.
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm1
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 8db2bda6b..310908689 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -507,6 +507,7 @@ sub main {
eval { $o = $::o = install_any::loadO($o, "Mandrake/base/patch-oem.pl"); log::l("successfully read oem patch") };
#- recovery mode should be read early to allow default parameter to be taken.
eval { $o = $::o = install_any::loadO($o, "Mandrake/base/recovery.cfg"); log::l("successfully read recovery") } if $::recovery;
+ $@ and $::recovery = 0; #- avoid keeping recovery if there was a problem reading the recovery.cfg file.
#- patch should be read after defcfg in order to take precedance.
eval { $o = $::o = install_any::loadO($o, $cfg); log::l("successfully read default configuration: $cfg") } if $cfg;
eval { $o = $::o = install_any::loadO($o, "patch"); log::l("successfully read patch") } if $patch;