diff options
author | Francois Pons <fpons@mandriva.com> | 2003-09-10 08:54:49 +0000 |
---|---|---|
committer | Francois Pons <fpons@mandriva.com> | 2003-09-10 08:54:49 +0000 |
commit | 21896a8feca02597f18fc66dc2f8b61627fe6a44 (patch) | |
tree | 0d21790cef8cda5e7fe86762e2d86377aaa4970e | |
parent | 3d88b87cbeab9dccd038fbf43b44c500872c9d0b (diff) | |
download | drakx-21896a8feca02597f18fc66dc2f8b61627fe6a44.tar drakx-21896a8feca02597f18fc66dc2f8b61627fe6a44.tar.gz drakx-21896a8feca02597f18fc66dc2f8b61627fe6a44.tar.bz2 drakx-21896a8feca02597f18fc66dc2f8b61627fe6a44.tar.xz drakx-21896a8feca02597f18fc66dc2f8b61627fe6a44.zip |
take recovery option into account.
-rw-r--r-- | perl-install/install2.pm | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm index e76c69241..379e3408e 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -379,6 +379,7 @@ sub main { test => sub { $::testing = 1 }, patch => sub { $patch = 1 }, defcfg => sub { $cfg = $v }, + recovery => sub { $::recovery = 1 }, newt => sub { $o->{interactive} = "newt" }, text => sub { $o->{interactive} = "newt" }, stdio => sub { $o->{interactive} = "stdio" }, @@ -503,6 +504,8 @@ sub main { #- oem patch should be read before to still allow patch or defcfg. 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; #- 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; |