summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/common.pm3
-rw-r--r--perl-install/install_steps.pm2
-rw-r--r--perl-install/install_steps_interactive.pm12
-rw-r--r--perl-install/pkgs.pm6
4 files changed, 13 insertions, 10 deletions
diff --git a/perl-install/common.pm b/perl-install/common.pm
index 8b158f010..199f2320a 100644
--- a/perl-install/common.pm
+++ b/perl-install/common.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA %EXPORT_TAGS @EXPORT_OK $printable_chars $sizeof_int $bitof_int
@ISA = qw(Exporter);
%EXPORT_TAGS = (
- common => [ qw(__ min max sum sign product bool listlength bool2text to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash set_new set_add round round_up round_down first second top uniq translate untranslate warp_text) ],
+ common => [ qw(__ min max sqr sum sign product bool listlength bool2text to_int to_float ikeys member divide is_empty_array_ref is_empty_hash_ref add2hash set_new set_add round round_up round_down first second top uniq translate untranslate warp_text) ],
functional => [ qw(fold_left map_index map_tab_hash mapn mapn_ difference2 before_leaving catch_cdie cdie) ],
file => [ qw(dirname basename touch all glob_ cat_ chop_ mode) ],
system => [ qw(sync makedev unmakedev psizeof strcpy gettimeofday syscall_ crypt_ getVarsFromSh setVarsInSh) ],
@@ -40,6 +40,7 @@ sub __ { $_[0] }
sub min { fold_left { $a < $b ? $a : $b } @_ }
sub max { fold_left { $a > $b ? $a : $b } @_ }
sub sum { fold_left { $a + $b } @_ }
+sub sqr { $_[0] * $_[0] }
sub sign { $_[0] <=> 0 }
sub product { fold_left { $a * $b } @_ }
sub first { $_[0] }
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index a6492836c..646061771 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -145,7 +145,7 @@ sub beforeInstallPackages {
sub installPackages($$) {
my ($o, $packages) = @_;
my $toInstall = [ grep { $_->{selected} && !$_->{installed} } values %$packages ];
- pkgs::install($o->{prefix}, $toInstall, $o->{isUpgrade}, 0);
+ pkgs::install($o->{prefix}, $toInstall, 0);
}
sub afterInstallPackages($) {
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d642d9383..1955a96dd 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -175,18 +175,18 @@ sub configureNetwork($) {
my $intf = network::findIntf($o->{intf} ||= [], $_);
add2hash($intf, $last);
add2hash($intf, { NETMASK => '255.255.255.0' });
- $o->configureNetworkIntf($intf);
+ $o->configureNetworkIntf($intf) or return;
$o->{netc} ||= {};
delete $o->{netc}{dnsServer};
delete $o->{netc}{GATEWAY};
$last = $intf;
}
- # {
- # my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain..."));
- # network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf});
- # }
- $o->configureNetworkNet($o->{netc}, $last ||= {}, @l);
+ #- {
+ #- my $wait = $o->wait_message(_("Hostname"), _("Determining host name and domain..."));
+ #- network::guessHostname($o->{prefix}, $o->{netc}, $o->{intf});
+ #- }
+ $o->configureNetworkNet($o->{netc}, $last ||= {}, @l) or return;
}
install_steps::configureNetwork($o);
}
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 953e02837..35821e4a4 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -2,7 +2,7 @@ package pkgs;
use diagnostics;
use strict;
-use vars qw($fd);
+use vars qw($fd $size_correction_ratio);
use common qw(:common :file :functional);
use install_any;
@@ -12,6 +12,8 @@ use fs;
use lang;
use c;
+$size_correction_ratio = 1.04;
+
1;
@@ -60,7 +62,7 @@ sub unselect($$;$) {
return if defined $size && $size <= 0;
#- garbage collect for circular dependencies
- my $changed = 1;
+ my $changed = 0; #1;
while ($changed) {
$changed = 0;
NEXT: foreach my $p (grep { $_->{selected} > 0 && !$_->{base} } values %$packages) {