From 779df8cedf13e9e1b8a76071783c8ee76256fe5e Mon Sep 17 00:00:00 2001 From: Francois Pons Date: Wed, 7 Aug 2002 14:51:13 +0000 Subject: allow automatic oem patch. add log if successfull patching. --- perl-install/install2.pm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'perl-install') diff --git a/perl-install/install2.pm b/perl-install/install2.pm index a89e8863a..e16f95678 100644 --- a/perl-install/install2.pm +++ b/perl-install/install2.pm @@ -497,9 +497,11 @@ sub main { #- needed before accessing floppy (in case of usb floppy) modules::load_category('bus/usb'); + #- 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") }; #- 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 { $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; eval { modules::load("af_packet") }; -- cgit v1.2.1