summaryrefslogtreecommitdiffstats
path: root/perl-install/install2.pm
diff options
context:
space:
mode:
authorFrancois Pons <fpons@mandriva.com>1999-10-06 17:52:58 +0000
committerFrancois Pons <fpons@mandriva.com>1999-10-06 17:52:58 +0000
commitfe224251aa0fe2285b7b1eda762e5b18ddee07a0 (patch)
tree72f80085cb97c05ac1b0f264ae0e1489c4d3e953 /perl-install/install2.pm
parent8f7cb6dae22fc5adc6eb8c57605e16f97cfee179 (diff)
downloaddrakx-fe224251aa0fe2285b7b1eda762e5b18ddee07a0.tar
drakx-fe224251aa0fe2285b7b1eda762e5b18ddee07a0.tar.gz
drakx-fe224251aa0fe2285b7b1eda762e5b18ddee07a0.tar.bz2
drakx-fe224251aa0fe2285b7b1eda762e5b18ddee07a0.tar.xz
drakx-fe224251aa0fe2285b7b1eda762e5b18ddee07a0.zip
*** empty log message ***
Diffstat (limited to 'perl-install/install2.pm')
-rw-r--r--perl-install/install2.pm13
1 files changed, 11 insertions, 2 deletions
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index d19240f9c..f50f289a5 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -75,6 +75,7 @@ $installSteps{first} = $installSteps[0];
#-#####################################################################################
#-INTERN CONSTANT
#-#####################################################################################
+
#- these strings are used in quite a lot of places and must not be changed!!!!!
my @install_classes = (__("beginner"), __("developer"), __("server"), __("expert"));
@@ -412,6 +413,8 @@ sub choosePackages {
#------------------------------------------------------------------------------
sub doInstallStep {
+ $o->readBootloaderConfigBeforeInstall if $_[1] == 1;
+
$o->beforeInstallPackages;
$o->installPackages($o->{packages});
$o->afterInstallPackages;
@@ -423,8 +426,8 @@ sub configureNetwork {
if ($o->{isUpgrade} && !$clicked) {
$o->{netc} or $o->{netc} = {};
- add2hash($o->{netc}, { network::read_conf("$o->{prefix}/etc/sysconfig/network") });
- add2hash($o->{netc}, { network::read_resolv_conf("$o->{prefix}/etc/resolv.conf") });
+ add2hash($o->{netc}, { network::read_conf("$o->{prefix}/etc/sysconfig/network") }) if -r "$o->{prefix}/etc/sysconfig/network";;
+ add2hash($o->{netc}, { network::read_resolv_conf("$o->{prefix}/etc/resolv.conf") }) if -r "$o->{prefix}/etc/resolv.conf";
foreach (all("$o->{prefix}/etc/sysconfig/network-scripts")) {
if (/ifcfg-(\w*)/) {
push @{$o->{intf}}, { network::read_conf("$o->{prefix}/etc/sysconfig/network-scripts/$_") };
@@ -518,7 +521,13 @@ sub main {
#- if this fails, it's okay -- it might help with free space though
unlink "/sbin/install" unless $::testing;
+ unlink "/sbin/cardmgr" unless $::testing;
unlink "/sbin/insmod" unless $::testing;
+ unlink "/sbin/rmmod" unless $::testing;
+ unlink "/modules/pcmcia_core.o" unless $::testing;
+ unlink "/modules/i82365.o" unless $::testing;
+ unlink "/modules/tcic.o" unless $::testing;
+ unlink "/modules/ds.o" unless $::testing;
print STDERR "in second stage install\n";
log::openLog(($::testing || $o->{localInstall}) && 'debug.log');