summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>2000-03-31 11:52:06 +0000
committerFrancois Pons <fpons@mandriva.com>2000-03-31 11:52:06 +0000
commit5999898cb22f35cfadbea9df40ee82e622be4519 (patch)
tree4d015a00ae722fd57f5593dbdc8c22e676948a2d /perl-install/install2.pm
parentbee063d9df87e71367e9b4ed98668a111b9ec62f (diff)
downloaddrakx-5999898cb22f35cfadbea9df40ee82e622be4519.tar
drakx-5999898cb22f35cfadbea9df40ee82e622be4519.tar.gz
drakx-5999898cb22f35cfadbea9df40ee82e622be4519.tar.bz2
drakx-5999898cb22f35cfadbea9df40ee82e622be4519.tar.xz
drakx-5999898cb22f35cfadbea9df40ee82e622be4519.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm5
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 6d028ebd2..4e5fb566f 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -366,7 +366,7 @@ sub doInstallStep {
$o->beforeInstallPackages;
$o->installPackages($o->{packages});
- $o->afterInstallPackages;
+ $o->afterInstallPackages;
}
#------------------------------------------------------------------------------
sub miscellaneous {
@@ -639,7 +639,7 @@ sub main {
modules::read_stage1_conf("/tmp/conf.modules");
modules::read_already_loaded();
- modules::load("af_packet");
+ eval { modules::load("af_packet") };
install_any::lnx4win_preinstall() if $o->{lnx4win};
#-the main cycle
@@ -670,6 +670,7 @@ sub main {
last if $o->{step} eq 'exitInstall';
}
+ install_any::clean_postinstall_rpms();
install_any::ejectCdrom();
fs::write($o->{prefix}, $o->{fstab}, $o->{manualFstab}, $o->{useSupermount});