no_comment

11 files changed, 53 insertions, 21 deletions

diff --git a/perl-install/Xconfigurator.pm b/perl-install/Xconfigurator.pm
index 83ec2f678..c25b9ac9a 100644
--- a/perl-install/Xconfigurator.pm
+++ b/perl-install/Xconfigurator.pm
@@ -411,9 +411,10 @@ sub autoDefaultDepth($$) {
     $best || $depth or die "no valid modes";
 }
 
-sub autoDefaultResolution(;$) {
-    my $size = round(shift || 14); #- assume a small monitor (size is in inch)
-    $monitorSize2resolution[$size] ||
+sub autoDefaultResolution {
+    my ($size, $isLaptop) = @_;
+    !$size && $isLaptop and return "1024x768";
+    $monitorSize2resolution[round($size || 14)] || #- assume a small monitor (size is in inch)
       $monitorSize2resolution[-1]; #- no corresponding resolution for this size. It means a big monitor, take biggest we have
 }
 
@@ -554,7 +555,7 @@ Try with another video card or monitor")), return;
     #- remove unusable resolutions (based on the video memory size and the monitor hsync rate)
     keepOnlyLegalModes($card, $o->{monitor});
 
-    my $res = $o->{resolution_wanted} || autoDefaultResolution($o->{monitor}{size});
+    my $res = $o->{resolution_wanted} || autoDefaultResolution($o->{monitor}{size}, );
     my $wres = first(split 'x', $res);
     my $depth = eval { $card->{default_depth} || autoDefaultDepth($card, $wres) };
 
@@ -746,7 +747,7 @@ sub show_info {
 #- Program entry point.
 sub main {
     my ($o, $allowFB);
-    ($prefix, $o, $in, $allowFB, $install) = @_;
+    ($prefix, $o, $in, $allowFB, $isLaptop, $install) = @_;
     $o ||= {};
     
     XF86check_link();
@@ -758,7 +759,7 @@ sub main {
 
 	$o->{monitor} = monitorConfiguration($o->{monitor}, $o->{card}{server} eq 'FBDev');
     }
-    my $ok = resolutionsConfiguration($o, auto => $::auto, noauto => $::noauto);
+    my $ok = resolutionsConfiguration($o, auto => $::auto, noauto => $::noauto, isLaptop => $isLaptop);
 
     $ok &&= testFinalConfig($o, $::auto, $::skiptest);
 
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index f747586e2..b2212955e 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -146,6 +146,7 @@ $resolution_wanted = "1024x768";
 
 %lines = (
 #-    'Cirrus Logic|GD 5446' => [ '	Option "no_bitblt"' ],
+      'Silicon Integrated Systems [SiS]|86C326' => [ '	Option "noaccel"' ],
 );
 
 #- most usefull server options have to be accessible at the beginning, since
diff --git a/perl-install/any.pm b/perl-install/any.pm
index 5b2fef5c3..04276b919 100644
--- a/perl-install/any.pm
+++ b/perl-install/any.pm
@@ -6,7 +6,9 @@ use strict;
 #-######################################################################################
 #- misc imports
 #-######################################################################################
-use common qw(:file :system :common :functional);
+use common qw(:system :file);
+use commands;
+use run_program;
 
 sub addKdmUsers {
     my ($prefix, @users) = @_;
@@ -14,13 +16,13 @@ sub addKdmUsers {
     my @u1 = my @users_male = qw(tie default curly);
     my @u2 = my @users_female = qw(brunette girl woman-blond);
     foreach (@users) {
-	my $l = rand() < timezone::sexProb($_->{name}) ? \@u2 : \@u1;
+	my $l = rand() < timezone::sexProb($_) ? \@u2 : \@u1;
 	my $u = splice(@$l, rand(@$l), 1); #- known biased (see cookbook for better)
-	symlink "../../../../icons/user-$u-mdk.xpm", "$prefix/usr/share/apps/kdm/pics/users/$_.xpm";
+	eval { commands::cp "$prefix/usr/share/icons/user-$u-mdk.xpm", "$prefix/usr/share/apps/kdm/pics/users/$_.xpm" };
 	@u1 = @users_male   unless @u1;
 	@u2 = @users_female unless @u2;
     }
-    symlinkf "../../../../icons/user-hat-mdk.xpm", "$prefix/usr/share/apps/kdm/pics/users/root.xpm" unless $::isStandalone;
+    eval { commands::cp "-f", "$prefix/usr/share/icons/user-hat-mdk.xpm", "$prefix/usr/share/apps/kdm/pics/users/root.xpm" } unless $::isStandalone;
 }
 
 sub addUsers {
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index f57ed6550..7fdb9bf93 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -489,6 +489,7 @@ sub addUser($) {
 	    if $u->{uid} != $u->{oldu} || $u->{gid} != $u->{oldg};
 
     }
+    require any;
     any::addUsers($o->{prefix}, map { $_->{name} } @l);
 }
 
@@ -575,7 +576,7 @@ sub setupXfree {
     { local $::testing = 0; #- unset testing
       local $::auto = 1;
       local $::skiptest = 1;
-      Xconfigurator::main($o->{prefix}, $o->{X}, class_discard->new, $o->{allowFB}, sub {
+      Xconfigurator::main($o->{prefix}, $o->{X}, class_discard->new, $o->{allowFB}, bool($o->{pcmcia}), sub {
          install_any::pkg_install($o, "XFree86-$_[0]");
       });
     }
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 1ec06cef2..5e6963435 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -182,7 +182,7 @@ sub new($$) {
 		unless (fork) {
 		    exec $_[0], "-kb", "-dpms","-s" ,"240", "-allowMouseOpenFail", "-xf86config", $f or exit 1;
 		}
-		foreach (1..10) {
+		foreach (1..15) {
 		    sleep 1;
 		    return 0 if !$ok;
 		    return 1 if c::Xtest($ENV{DISPLAY});
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a828d6f77..4af34d80c 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -427,9 +427,36 @@ sub installCrypto {
     }
     
     is_empty_hash_ref($u) and $o->ask_yesorno('', 
-"Do you want to download cryptographic packages?
-(! !)
-  ") || return;
+_("You have now the possibility to download software aimed for encryption.
+
+WARNING:
+
+Due to different general requirements applicable to these software and imposed
+by various jurisdictions, customer and/or end user of theses software should
+ensure that the laws of his/their jurisdiction allow him/them to download, stock
+and/or use these software.
+
+In addition customer and/or end user shall particularly be aware to not infringe
+the laws of his/their jurisdiction. Should customer and/or end user do not
+respect the provision of these applicable laws, he/they will incur serious
+sanctions.
+
+In no event shall Mandrakesoft nor its manufacturers and/or suppliers be liable
+for special, indirect or incidental damages whatsoever (including, but not
+limited to loss of profits, business interruption, loss of commercial data and
+other pecuniary losses, and eventual liabilities and indemnification to be paid
+pursuant to a court decision) arising out of use, possession, or the sole
+downloading of these software, to which customer and/or end user could
+eventually have access after having sign up the present agreement.
+
+The present agreement shall be governed and construed pursuant to the laws of
+France except to the extent that the application of local laws is required by
+mandatory laws of public order. However this agreement expressly excludes any
+conflict of laws, principles, choice of law or rule to the contrary. Therefore
+French laws shall prevail on any other local laws.
+
+For any queries relating to these agreement, please contact Mandrakesoft 43, rue
+d'Aboukir, 75002 Paris FRANCE")) || return;
 
     require crypto;
     eval {
@@ -812,7 +839,7 @@ sub setupXfree {
       local $::noauto = $::expert && !$o->ask_yesorno('', _("Try to find PCI devices?"), 1);
       $::noauto = $::noauto; #- no warning
 
-      Xconfigurator::main($o->{prefix}, $o->{X}, $o, $o->{allowFB}, sub {
+      Xconfigurator::main($o->{prefix}, $o->{X}, $o, $o->{allowFB}, bool($o->{pcmcia}), sub {
 	  install_any::pkg_install($o, "XFree86-$_[0]");
       });
     }
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 31166e0ff..e9b892954 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -19,7 +19,7 @@ XFree86-Sun XFree86-SunMono XFree86-Sun24 XFree86-3DLabs kernel-BOOT
 MySQL MySQL_GPL mod_php3 midgard postfix metroess metrotmpl
 hackkernel hackkernel-BOOT hackkernel-fb hackkernel-headers
 hackkernel-pcmcia-cs hackkernel-smp hackkernel-smp-fb 
-autoirpm autoirpm-icons numlock
+autoirpm autoirpm-icons numlock kernel-linus
 );
 
 my %by_lang = (
diff --git a/perl-install/printerdrake.pm b/perl-install/printerdrake.pm
index c014440c1..876f39dbe 100644
--- a/perl-install/printerdrake.pm
+++ b/perl-install/printerdrake.pm
@@ -253,7 +253,7 @@ _("Color depth options") => { val => \$printer->{BITSPERPIXEL}, type => 'list',
 	    if (@lpq_output) {
 		$action = $in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
 This may take a little time before printer start.
-Does it work properly? Printing status:\n%s", "@lpq_output"), 1) ? 'done' : 'change';
+Printing status:\n%s\n\nDoes it work properly?", "@lpq_output"), 1) ? 'done' : 'change';
 	    } else {
 		$action = $in->ask_yesorno('', _("Test page(s) have been sent to the printer daemon.
 This may take a little time before printer start.
diff --git a/perl-install/share/compssList b/perl-install/share/compssList
index 00bf0610d..1bcfa8fb0 100644
--- a/perl-install/share/compssList
+++ b/perl-install/share/compssList
@@ -189,7 +189,7 @@ gnomehack                                     50     0    45
 gnomeicu                                      61     0    58
 gnome-libs                                     0     0    55
 gnome-libs-devel                              10     0    55
-gnome-linuxconf                               69     0    69
+gnome-linuxconf                               74     0    74
 gnome-media                                   60     0    58
 gnome-objc                                     0     0    40
 gnome-objc-devel                              10     0    40
diff --git a/perl-install/standalone/XFdrake b/perl-install/standalone/XFdrake
index b4b5b4e79..fb5eb9d00 100755
--- a/perl-install/standalone/XFdrake
+++ b/perl-install/standalone/XFdrake
@@ -49,6 +49,6 @@ system("mount /proc 2>/dev/null"); # ensure /proc is mounted for pci probing
 my $i = $0 =~ Xdrakres ? Xconfig::getinfoFromXF86Config() : {};
 Xconfig::getinfo($i);
 
-Xconfigurator::main('', $i, $in, 0, sub { system("urpmi --auto XFree86-$_[0]") });
+Xconfigurator::main('', $i, $in, 0, 0, sub { system("urpmi --auto XFree86-$_[0]") });
 
 $in->exit(0);
diff --git a/perl-install/timezone.pm b/perl-install/timezone.pm
index 9c1427c76..a5cb8f849 100644
--- a/perl-install/timezone.pm
+++ b/perl-install/timezone.pm
@@ -79,7 +79,7 @@ sub bestTimezone {
 }
 
 my %sex = (
-fr_FR => { '[iln]a$' => 1, '[cdilnst]e$' => 1, 'e$' => .8, 'n$' => .1, 'd$' => .05 },
+fr_FR => { '[iln]a$' => 1, '[cdilnst]e$' => 1, 'e$' => .8, 'n$' => .1, 'd$' => .05, 't$' => 0 },
 en => { 'a$' => 1, 'o$' => 0, '[ln]$' => .3, '[rs]$' => .2 },
 );