From 35b788a61e2e63a20666d236609b3f01813b91fc Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Tue, 16 Sep 2003 10:51:28 +0000 Subject: disable recovery mode if recovery.cfg file has not been read successfully. --- perl-install/install2.pm | 1 + 1 file changed, 1 insertion(+) (limited to 'perl-install/install2.pm') 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; -- cgit v1.2.1