no_comment

8 files changed, 84 insertions, 60 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 822f51534..e3011e4ab 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -782,6 +782,6 @@ _("I can set up your computer to automatically start X upon booting.
 Would you like X to start when you reboot?"), 1);
 
 	rewriteInittab($run ? 5 : 3) unless $::testing;
-	run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/;
+	run_program::rooted($prefix, "chkconfig", "--del", "gpm") if $o->{mouse}{device} =~ /ttyS/ && !$::isStandalone;
     }
 }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index ef15b58e3..98fb7225b 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -127,7 +127,7 @@ sub setPackages($) {
 	pkgs::getDeps($o->{packages});
 
 	my $c; ($o->{compss}, $c) = pkgs::readCompss($o->{packages});
-	$o->{compssListLevels} = pkgs::readCompssList($o->{packages}, $c, $o->{lang});
+	$o->{compssListLevels} = pkgs::readCompssList($o->{packages}, $c);
 	$o->{compssUsers} = pkgs::readCompssUsers($o->{packages}, $o->{compss});
 
 	grep { !$o->{packages}{$_} && log::l("missing base package $_") } @{$o->{base}} and die "missing some base packages";
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index c1e1784e9..56f8c9064 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -342,6 +342,7 @@ sub installCrypto {
     my $u = $o->{crypto} or return; $u->{mirror} or return;
     my ($packages, %done);
     my $dir = "$o->{prefix}/tmp";
+    network::up_it($o->{prefix}, $o->{intf}) if $o->{intf};
 
     local *install_any::getFile = sub {
 	local *F;
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a32b3bd76..8f7603dce 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -406,7 +406,16 @@ _("Second DNS Server") => \$m->{dns2},
 sub installCrypto {
     my ($o) = @_;
     my $u = $o->{crypto} ||= {};
-    $::expert && $o->{intf} && $o->{netc}{NETWORKING} ne 'false' or return;
+    
+    $::expert or return;
+    if ($o->{intf} && $o->{netc}{NETWORKING} ne 'false') {
+	my $w = $o->wait_message('', _("Bringing up the network"));
+	network::up_it($o->{prefix}, $o->{intf});
+    } elsif ($o->{modem}) {
+	run_program::rooted($o->{prefix}, "ifup", "ppp0");
+    } else {
+	return;
+    }
     
     is_empty_hash_ref($u) and $o->ask_yesorno('', 
 "Do you want to download cryptographic packages?
@@ -744,7 +753,7 @@ sub miscellaneous {
 _("Use hard drive optimisations?") => { val => \$u->{HDPARM}, type => 'bool', text => _("(may cause data corruption)") },
 _("Choose security level") => { val => \$s, list => [ map { $l{$_} } ikeys %l ], not_edit => 1 },
 _("Precise RAM size if needed (found %d MB)", availableRam / 1024 + 3) => \$u->{memsize}, #- add three for correction.
-_("Removable media automounting") => { val => $o->{useSupermount}, type => 'bool', text => 'supermount' },
+_("Removable media automounting") => { val => \$o->{useSupermount}, type => 'bool', text => 'supermount' },
      $u->{numlock} ? (
 _("Enable num lock at startup") => { val => \$u->{numlock}, type => 'bool' },
      ) : (),
diff --git a/perl-install/network.pm b/perl-install/network.pm
index e471734bc..3f028f320 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -10,6 +10,7 @@ use Socket;
 
 use common qw(:common :file :system :functional);
 use detect_devices;
+use run_program;
 use log;
 
 #-######################################################################################
@@ -47,6 +48,14 @@ sub read_interface_conf {
     \%intf;
 }
 
+sub up_it {
+    my ($prefix, $intfs) = @_;
+    $_->{isUp} and return foreach @$intfs;
+    my $f = "/etc/resolv.conf"; symlink "$prefix/$f", $f;
+    run_program::rooted($prefix, "/etc/rc.d/init.d/network", "start");
+    $_->{isUp} = 1 foreach @$intfs;
+}
+
 sub write_conf {
     my ($file, $netc) = @_;
 
@@ -148,7 +157,10 @@ sub sethostname {
 
 sub resolv($) {
     my ($name) = @_;
-    is_ip($name) ? $name : join(".", unpack "C4", (gethostbyname $name)[4]);
+    is_ip($name) and return $name;
+    my $a = join(".", unpack "C4", (gethostbyname $name)[4]);
+    log::l("resolved $name in $a");
+    $a;
 }
 
 sub dnsServers {
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index a9eef2b89..870d8bb9c 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -216,7 +216,7 @@ sub readCompss($) {
 }
 
 sub readCompssList($$$) {
-    my ($packages, $compss_, $lang) = @_;
+    my ($packages, $compss_) = @_;
     my $f = install_any::getFile("compssList") or die "can't find compssList";
     local $_ = <$f>;
     my $level = [ split ];
@@ -234,8 +234,9 @@ sub readCompssList($$$) {
 	my $p = $e->{$name} or log::l("unknown entry $name (in compssList)"), next;
 	$p->{values} = \@values;
     }
-    my $locales = "locales-" . substr($lang, 0, 2);
-    if (my $p = $packages->{$locales}) {
+    foreach (split ':', $ENV{LANGUAGE}) {
+	my $locales = "locales-" . substr($_, 0, 2);
+	my $p = $packages->{$locales} or next;
 	foreach ($locales, @{$p->{provides} || []}) {
 	    my $p = $packages->{$_} or next;
 	    $p->{values} = [ map { $_ + 70 } @{$p->{values}} ];
diff --git a/perl-install/resize_fat/main.pm b/perl-install/resize_fat/main.pm
index a67dbd26f..ac2fffaa2 100644
--- a/perl-install/resize_fat/main.pm
+++ b/perl-install/resize_fat/main.pm
@@ -130,7 +130,7 @@ sub resize {
     $size >= $min or die "Minimum filesystem size is $min sectors";
     $size <= $max or die "Maximum filesystem size is $max sectors";
 
-    log::l("resize_fat: Partition size fill be ", $size * $SECTORSIZE >> 20, "Mb (well exactly ${size} sectors)");
+    log::l("resize_fat: Partition size will be ", $size * $SECTORSIZE >> 20, "Mb (well exactly ${size} sectors)");
 
     my $new_data_size = $size * $SECTORSIZE - $fs->{cluster_offset};
     my $new_nb_clusters = divide($new_data_size, $fs->{cluster_size});
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 96a67ba0d..84ce8e384 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -6,13 +6,13 @@ adjtimex                                       1    40    87
 AfterStep                                     65    20    53
 AfterStep-APPS                                62    18    55
 aktion                                        79    12    15
-am-utils                                      22     0    19
+am-utils                                       0     5    19
 anacron                                       85    40    85
-anonftp                                       15    99    13
+anonftp                                        0    82    13
 AnotherLevel                                  30     0    27
-apache                                        15    99    25
-apache-devel                                   1     0    25
-apmd                                          11    99    25
+apache                                         2    86    25
+apache-devel                                   0    10    25
+apmd                                           0     0     0
 arpwatch                                       1     0     0
 ash                                           10    10    10
 at                                            30    99    94
@@ -28,9 +28,8 @@ awesfx                                        15     0    13
 bash1                                         15     0    13
 bash-doc                                      30     0    71
 bc                                            17     0    25
-BeroFTPD                                      25    99    10
-BeroList                                      17    99    15
-BeroList-CGI                                  17    99    15
+BeroList                                       0    99    15
+BeroList-CGI                                   0    99    15
 bin86                                          5     0    91
 bind                                          12    99    10
 bind-devel                                     1     0     0
@@ -42,7 +41,7 @@ blt                                            1     0    75
 bootparamd                                     1     0     0
 byacc                                          1     0    80
 bzip2                                          0    99    75
-caching-nameserver                             1    99     0
+caching-nameserver                             0    20    13
 cbb                                           15     0    13
 cdecl                                         10     0    70
 cdp                                           30     0    27
@@ -59,7 +58,7 @@ cleanfeed                                     24    99    21
 colorgcc                                       1     0    84
 comanche                                       1    80     0
 compat-glibc                                   0     0    96
-comsat                                         0     0     0
+comsat                                         0     8     2
 control-center                                70     0    10
 control-center-devel                           5     0    10
 control-panel                                 60     0    54
@@ -74,8 +73,8 @@ cxhextris                                     40     0    36
 defrag                                         0     0     0
 desktop-backgrounds                           66     0    54
 desktopcfg                                    72     0    72
-dhcp                                          17    99    15
-dhcpcd                                         1    99     0
+dhcp                                           0    79    12
+dhcpcd                                         0     0     0
 dialog                                         1     0    71
 diffstat                                       3     0    87
 diffutils                                     25     0    87
@@ -100,7 +99,7 @@ emacs-X11                                     41     0    83
 enlightenment                                 70     0    55
 enlightenment-conf                            70     0    55
 enscript                                      17     0    71
-esound                                        62     0    55
+esound                                         0     0     0
 esound-devel                                   5     0     4
 ethemes                                       58     0    52
 exmh                                          40     0    36
@@ -131,7 +130,7 @@ fvwm2                                         30     0    36
 fvwm2-icons                                   30     0    36
 fwhois                                        40     0    36
 gaddr                                         45     0    40
-gated                                          1    99     0
+gated                                          0    69     0
 gatos                                         55     0    49
 gawk                                           1     0    87
 gcc                                           35     0    90
@@ -239,18 +238,18 @@ icewm-light                                   90     0    90
 icewm-themes                                  60     0    54
 ImageMagick                                   42     0    60
 ImageMagick-devel                              1     0    60
-imap                                          40    99    36
+imap                                           0    70     6
 imlib                                          1     0    71
 imbib-cfgeditor                               70     0    71
 imlib-devel                                    1     0    50
 imwheel                                       70     0    58
 indent                                        20     0    91
 indexhtml                                      0    99    96
-inews                                         17     0    15
-inn                                           39    99    20
+inews                                          6    12    15
+inn                                            0    99    20
 inn-devel                                      1    99    20
 install-guide                                 40     0    36
-intimed                                       12    99    10
+intimed                                        0    45    10
 ipchains                                      15    99    13
 ipxutils                                      10    99     9
 irssi                                         69     0    57
@@ -457,10 +456,10 @@ man-pages-ja                                  20     0    20
 man-pages-ko                                  20     0    20
 man-pages-pl                                  20     0    20
 man-pages-ru                                  20     0    20
-mars-nwe                                       0     0     0
+mars-nwe                                       0     6     0
 mawk                                           0     0    80
 mc                                            35     0    31
-mcserv                                        10    99     9
+mcserv                                         0    99     9
 Mesa                                           0     0    70
 Mesa-demos                                    25     0    55
 Mesa-devel                                     1     0    70
@@ -477,8 +476,10 @@ mkisofs                                       15     0    13
 mkkickstart                                    2     0     1
 mkxauth                                        2    99     1
 modemtool                                     50     0    45
-mod_perl                                       2    99     1
-mod_php3                                       2    99     1
+mod_perl                                       0    89    31
+mod_php3                                       0    79    21
+mod_php3-imap                                  0    79    20
+mod_php3-pgsql                                 0    79    20
 mouseconfig                                   90     0    90
 mpage                                         55     0    80
 mpg123                                        47     0    42
@@ -488,8 +489,8 @@ mt-st                                         55     0    49
 multimedia                                    65     0    53
 mutt                                          50     0    45
 mxp                                            0     0     0
-MySQL-shared-libs                              1     0     0
-MySQL_GPL-shared-libs                          1     0     0
+MySQL-shared-libs                              0    50     7
+MySQL_GPL-shared-libs                          0    50     7
 nag                                           55     0    25
 nc                                             0     0     0
 ncftp                                         55     0    49
@@ -505,11 +506,11 @@ netscape-francais                             19     0    22
 netscape-navigator                            60     0    54
 newt                                          20     0    75
 newt-devel                                     5     0    75
-nfs-utils                                     15    80    13
-nfs-utils-clients                             15    80    53
+nfs-utils                                      0    80    13
+nfs-utils-clients                             45    80    53
 nmh                                            0     0     0
 npxanim                                       82     0    61
-nscd                                           1     0     0
+nscd                                           0     9     0
 open                                           6     0    80
 ORBit                                          0     0    55
 ORBit-devel                                    2     0    55
@@ -535,18 +536,18 @@ pmake                                         22     0    75
 pmake-customs                                 21     0    72
 popt                                          26     0    80
 portmap                                       22    99    19
-postfix                                       35    90    31
-postgresql                                    26    99    23
-postgresql-clients                            26     0    23
-postgresql-devel                              26    99    23
-postgresql-server                             26    99    23
-postgresql-tcl                                26     0    23
+postfix                                        0    90    31
+postgresql                                     0    99    23
+postgresql-clients                             0     0    23
+postgresql-devel                               0    99    23
+postgresql-server                              0    99    23
+postgresql-tcl                                 0     0    23
 ppp                                           87     0    82
 printtool                                     52     0    46
 procinfo                                      32     0    96
 procps-X11                                    36     0    32
 psacct                                        19     0    87
-pump                                          30     0    27
+pump                                           0     0     0
 pwdb                                          13     0    75
 pws                                           82     0    70
 pygnome                                       12     0    50
@@ -573,7 +574,7 @@ rhmask                                        12     0    10
 rhsound                                       40     0    36
 rhs-printfilters                               1     1     0
 rmt                                           27     0    24
-routed                                        22    99    19
+routed                                         0    59    19
 rpmdrake                                      84    10    81
 rpm-devel                                      6     0    80
 rsh                                           46    99    75
@@ -587,9 +588,9 @@ samba                                         34    99    30
 sane                                          59     0    53
 sane-devel                                     3     0     2
 screen                                        22     0    19
-sendmail                                      41    90    36
-sendmail-cf                                   41    90    36
-sendmail-doc                                  41     0    36
+sendmail                                       0    90    36
+sendmail-cf                                    0    90    36
+sendmail-doc                                   0    10    36
 setserial                                     62     0    55
 setuptool                                     90     0    90
 sgml-tools                                    16     0    75
@@ -597,7 +598,7 @@ shapecfg                                       9     0     8
 sharutils                                     43    99    38
 slang                                         31     0    75
 slang-devel                                    7     0    70
-sliplogin                                     19     0    17
+sliplogin                                      0    23     7
 slocate                                       99    99    99
 slrn                                          56     0    50
 sndconfig                                     90     0    90
@@ -605,7 +606,7 @@ sox                                           56    99    80
 sox-devel                                      8     0    70
 space_sounds                                  62     0    55
 specspo                                       16     0    14
-squid                                         12     0    10
+squid                                          0    64    16
 statserial                                    15     0    13
 strace                                        11     0    87
 svgalib                                        3     0    63
@@ -624,7 +625,7 @@ tclx                                          12     0    70
 tcpdump                                        3    85     2
 tcp_wrappers                                   0    99     0
 tcsh                                           1     0     0
-telnet                                        64    99    87
+telnet                                        88    99    87
 telnet-server                                 42    99    37
 tetex                                         55     0    50
 tetex-afm                                     55     0    40
@@ -633,7 +634,7 @@ tetex-dvips                                   55     0    40
 tetex-latex                                   55     0    40
 tetex-xdvi                                    55     0    50
 texinfo                                       57     0    50
-tftp                                           3     0     2
+tftp                                           0    60     2
 thud                                          82     0    70
 time                                          40     0    87
 timed                                         40     0    36
@@ -653,9 +654,9 @@ trn                                           46     0    41
 trojka                                        54     0    48
 ttfonts                                       57     0    51
 tunelp                                        32     0    28
-ucd-snmp                                      13     0    75
-ucd-snmp-devel                                 6     0    75
-ucd-snmp-utils                                12     0    75
+ucd-snmp                                       0    57	  45
+ucd-snmp-devel                                 0    57	  45
+ucd-snmp-utils                                 0    57	  45
 umb-scheme                                    10     0    65
 unarj                                         18     0    16
 units                                         12     0    10
@@ -666,7 +667,7 @@ urw-fonts                                     38     0    34
 usermode                                      71     0    58
 usernet                                       42     0    37
 utempter                                      90     0    73
-uucp                                          16    99    14
+uucp                                           0    69     2
 vigmeup                                       13     0    11
 vim-common                                     0    99     0
 vim-enhanced                                  26    78    83
@@ -674,7 +675,7 @@ vim-X11                                       29     0    26
 vlock                                         38    99    80
 vnc                                           44     0    39
 vnc-java                                      38     0    34
-vnc-server                                    43     0    38
+vnc-server                                     0    14    28
 vnc-SVGALIB                                   43     0    38
 w3c-libwww                                    18     0    16
 w3c-libwww-apps                               22     0    19
@@ -754,7 +755,7 @@ xmms-esd                                      46     0    41
 xmms-gnome                                    71     0    58
 xmms-mikmod                                   43     0    38
 xmorph                                        49     0    44
-xntp3                                         46     0    41
+xntp3                                          0    25    31
 xosview                                       51     0    45
 xpaint                                        53     0    47
 xpat2                                         43     0    38
@@ -773,9 +774,9 @@ xtrojka                                       51     0    45
 xv                                            53     0    47
 xwpick                                        55     0    49
 xxgdb                                         53     0    47
-ypbind                                        16     0    14
-ypserv                                        15     0    13
-yp-tools                                      15     0    13
+ypbind                                         0     0     0
+ypserv                                         0    20    13
+yp-tools                                       0    20    13
 ytalk                                         21     0    18
 yudit                                         43     0    38
 zgv                                           15     0    13