diff options
| author | Francois Pons <fpons@mandriva.com> | 2002-08-07 14:51:13 +0000 |
|---|---|---|
| committer | Francois Pons <fpons@mandriva.com> | 2002-08-07 14:51:13 +0000 |
| commit | 779df8cedf13e9e1b8a76071783c8ee76256fe5e (patch) | |
| tree | a3777180a2174d71562218515930eba2cdc3640b | |
| parent | 17f759c0d3a44c7e2b709c8bed27705bfe594939 (diff) | |
| download | drakx-backup-do-not-use-779df8cedf13e9e1b8a76071783c8ee76256fe5e.tar drakx-backup-do-not-use-779df8cedf13e9e1b8a76071783c8ee76256fe5e.tar.gz drakx-backup-do-not-use-779df8cedf13e9e1b8a76071783c8ee76256fe5e.tar.bz2 drakx-backup-do-not-use-779df8cedf13e9e1b8a76071783c8ee76256fe5e.tar.xz drakx-backup-do-not-use-779df8cedf13e9e1b8a76071783c8ee76256fe5e.zip | |
allow automatic oem patch. add log if successfull patching.
| -rw-r--r-- | perl-install/install2.pm | 6 |
1 files changed, 4 insertions, 2 deletions
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") }; |