summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2002-05-27 16:17:19 +0000
committerFrancois Pons <fpons@mandriva.com>2002-05-27 16:17:19 +0000
commit379759d3a6a4bf32055f9fadbd56c7e7138a3f21 (patch)
treeb034744169b94229711bc4635a5ae35ba4ee529e
parent6af857a07509bda54b9d795189e4ef3c5902bc5e (diff)
downloaddrakx-379759d3a6a4bf32055f9fadbd56c7e7138a3f21.tar
drakx-379759d3a6a4bf32055f9fadbd56c7e7138a3f21.tar.gz
drakx-379759d3a6a4bf32055f9fadbd56c7e7138a3f21.tar.bz2
drakx-379759d3a6a4bf32055f9fadbd56c7e7138a3f21.tar.xz
drakx-379759d3a6a4bf32055f9fadbd56c7e7138a3f21.zip
make sure patch is always read after defcfg to take precedance.
-rw-r--r--perl-install/install2.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index a15b089ca..19abc9b81 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -501,11 +501,12 @@ sub main {
}
require"install_steps_$o->{interactive}.pm" if $o->{interactive}; #- no space to skip perl2fcalls
- # needed before accessing floppy (in case of usb floppy)
+ #- needed before accessing floppy (in case of usb floppy)
$::noauto or modules::load_thiskind("usb");
-
- eval { $o = $::o = install_any::loadO($o, "patch") } if $patch;
+
+ #- patch should be read after defcfg in order to take precedance.
eval { $o = $::o = install_any::loadO($o, $cfg) } if $cfg;
+ eval { $o = $::o = install_any::loadO($o, "patch") } if $patch;
eval { modules::load("af_packet") };