no_comment

8 files changed, 34 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 1f87e60e8..68a102225 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ upload: tar install
 	rm -f $(ROOTDEST)/Mandrake/mdkinst.tgz
 	rm -f /tmp/mdkinst_done
 
-# mkisofs -r -J -b images/cdrom.img -c images/.catalog /tmp/r /mnt/disk/ | cdrecord -v -eject speed=6 dev=1,0 -
+# mkisofs -r -J -b images/cdrom.img -c images/boot.cat /tmp/r /mnt/disk/ | cdrecord -v -eject speed=6 dev=1,0 -
 # as distrib: mv ~/oxygen/oxygen/images ~/tmp/r
 # as mandrake: mkisofs -r -b images/cdrom.img -c images/boot.cat -o /home/ftp/linux-mandrake/pub/mirror/oxyiso/oxygen-3.iso ~distrib/tmp/r ~distrib/oxygen/oxygen
 # as mandrake: remove old iso in /home/ftp/linux-mandrake/pub/mirror/oxyiso
diff --git a/perl-install/Xconfigurator_consts.pm b/perl-install/Xconfigurator_consts.pm
index 2f67bca2d..6ec58f536 100644
--- a/perl-install/Xconfigurator_consts.pm
+++ b/perl-install/Xconfigurator_consts.pm
@@ -148,6 +148,7 @@ $resolution_wanted = "1024x768";
 %lines = (
 #-    'Cirrus Logic|GD 5446' => [ '	Option "no_bitblt"' ],
       'Silicon Integrated Systems [SiS]|86C326' => [ '	Option "noaccel"' ],
+      'Trident Microsystems|Cyber 9525' => [ '	Option "noaccel"' ],
       'S3 Inc.|86c368 [Trio 3D/2X]' => [ '	ChipID  0x8a10' ],
 );
 
diff --git a/perl-install/install2.pm b/perl-install/install2.pm
index 911a2f5cd..00aeb8fc2 100644
--- a/perl-install/install2.pm
+++ b/perl-install/install2.pm
@@ -393,8 +393,7 @@ sub configureNetwork {
 	    }
 	}
     }
-
-    $o->configureNetwork;
+    $o->configureNetwork($_[1] == 1);
 }
 #------------------------------------------------------------------------------
 sub installCrypto { $o->installCrypto }
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index 7d1e6563c..41007c735 100644
--- a/perl-install/install_any.pm
+++ b/perl-install/install_any.pm
@@ -138,7 +138,7 @@ sub setPackages($) {
 
 	grep { !$o->{packages}{$_} && log::l("missing base package $_") } @{$o->{base}} and die "missing some base packages";
     } else {
-    	$_->{selected} = 0 foreach values %{$o->{packages}};
+	pkgs::unselect_all($o->{packages});
     }
 
     #- this will be done if necessary in the selectPackagesToUpgrade,
@@ -414,7 +414,7 @@ sub g_auto_install(;$) {
     my @fields = qw(mntpoint type size);
     $o->{partitions} = [ map { my %l; @l{@fields} = @$_{@fields}; \%l } grep { $_->{mntpoint} } @{$::o->{fstab}} ];
     
-    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade manualFstab nomouseprobe crypto modem useSupermount); #- TODO modules bootloader 
+    exists $::o->{$_} and $o->{$_} = $::o->{$_} foreach qw(lang autoSCSI authentication printer mouse wacom netc timezone superuser intf keyboard mkbootdisk base users installClass partitioning isUpgrade manualFstab nomouseprobe crypto modem useSupermount auto_probe_pci); #- TODO modules bootloader 
 
     if (my $card = $::o->{X}{card}) {
 	$o->{X}{card}{$_} = $card->{$_} foreach qw(default_depth);
diff --git a/perl-install/install_steps_gtk.pm b/perl-install/install_steps_gtk.pm
index 2181d02aa..06cc9809f 100644
--- a/perl-install/install_steps_gtk.pm
+++ b/perl-install/install_steps_gtk.pm
@@ -301,13 +301,11 @@ When sure, press Ok."))) {
 #------------------------------------------------------------------------------
 sub choosePackages {
     my ($o, $packages, $compss, $compssUsers, $compssUsersSorted, $first_time) = @_;
-    my $size = install_any::getAvailableSpace($o) * 0.7;
 
     if ($::beginner) {
 	require pkgs;
-	pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, 1, $size, $o->{installClass}, $o->{isUpgrade});
+	pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, 1, install_any::getAvailableSpace($o) * 0.7, $o->{installClass}, $o->{isUpgrade});
     } else {
-	pkgs::setSelectedFromCompssList($o->{compssListLevels}, $o->{packages}, $::expert ? 95 : 80, $size, $o->{installClass}) unless $::expert || $o->{isUpgrade};
 	install_steps_interactive::choosePackages(@_);
 	chooseSizeToInstall(@_);
 	choosePackagesTree(@_) if $::expert;
@@ -316,7 +314,7 @@ sub choosePackages {
 sub chooseSizeToInstall {
     my ($o, $packages, $compss, $compssUsers, $first_time) = @_;
     my $availableSpace = int(install_any::getAvailableSpace($o) / sqr(1024));
-    my $current = pkgs::correctSize((sum map { $_->{size} } grep { $_->{selected} } values %$packages) / sqr(1024));
+    my $current = pkgs::correctedSelectedSize($packages);
     my $w = my_gtk->new('');
     my $adj = create_adjustment($current * 1.3, $current, $availableSpace);
     my $spin = gtkset_usize(new Gtk::SpinButton($adj, 0, 0), 100, 0);
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a66f0d07f..cca487be1 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -232,17 +232,28 @@ sub selectPackagesToUpgrade {
 #------------------------------------------------------------------------------
 sub choosePackages {
     my ($o, $packages, $compss, $compssUsers, $compssUsersSorted) = @_;
+    my $availableSpace = int(install_any::getAvailableSpace($o) / sqr(1024));
 
     require pkgs;
+
+    #- alas, it through away any tree selected packages
+    pkgs::unselect_all($o->{packages});
+    pkgs::setSelectedFromCompssList($o->{compssListLevels}, $packages, $::expert ? 95 : 80, $availableSpace * 0.7, $o->{installClass}) unless $o->{isUpgrade};
+
     $o->ask_many_from_list_ref('',
 			       _("Package Group Selection"),
 			       [ @$compssUsersSorted ],
 			       [ map { \$o->{compssUsersChoice}{$_} } @$compssUsersSorted ]
-			       );
+			       ) or goto &choosePackages;
     while (my ($k, $v) = each %{$o->{compssUsersChoice}}) {
 	$v or next;
 	pkgs::select($packages, $_) foreach @{$o->{compssUsers}{$k}};
     }
+    my $current = pkgs::correctedSelectedSize($packages);
+    if ($availableSpace < $current) {
+	$o->ask_warn('', _("Too many packages chosen: %dMB doesn't fit in %dMB", $current, $availableSpace));
+	goto &choosePackages;
+    }
 
     my $f = "$o->{prefix}/etc/sysconfig/desktop";
     output($f, "KDE\n") if !-e $f && $o->{compssUsersChoice}{KDE};
@@ -280,7 +291,7 @@ sub afterInstallPackages($) {
 sub configureNetwork($) {
     my ($o, $first_time) = @_;
     local $_;
-    if ($o->{intf} && $o->{netc}{NETWORKING} ne 'false') {
+    if ($o->{intf}) {
 	if (!$::beginner && $first_time || $::expert) {
 	    my @l = (
 		     __("Keep the current IP configuration"),
@@ -1014,8 +1025,12 @@ You may have to restart installation and give ``%s'' at the prompt", $ide));
 
 #------------------------------------------------------------------------------
 sub setup_thiskind {
-    my ($o, $type, $auto, $at_least_one) = @_;
-    my @l = $o->load_thiskind($type) unless $::expert && !$o->ask_yesorno('', _("Try to find PCI devices?"), 1);
+    my ($o, $type, $auto, $at_least_one) = @_;    
+
+    if (!exists $o->{auto_probe_pci}) {
+	$o->{auto_probe_pci} = !$::expert || $o->ask_yesorno('', _("Try to find PCI devices?"), 1);
+    }
+    my @l = $o->load_thiskind($type) if $o->{auto_probe_pci};
     return if $auto && (@l || !$at_least_one);
     while (1) {
 	my $msg = @l ?
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 3f028f320..d441466e1 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -216,14 +216,14 @@ sub dns {
     my ($ip) = @_;
     my $mask = masked_ip($ip);
     my @masked = masked_ip($ip) =~ $ip_regexp;
-    $masked[3]  = 12;
+    $masked[3]  = 1;
     join (".", @masked);
 
 }
 sub gateway {
     my ($ip) = @_;
     my @masked = masked_ip($ip) =~ $ip_regexp;
-    $masked[3]  = 1;
+    $masked[3]  = 254;
     join (".", @masked);
 
 }
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 83bc78676..8e3ecf63f 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -48,6 +48,12 @@ my $B = 16258;
 sub correctSize { ($A - $_[0]) * $_[0] / $B } #- size correction in MB.
 sub invCorrectSize { $A / 2 - sqrt(max(0, sqr($A) - 4 * $B * $_[0])) / 2 }
 
+sub selectedSize {
+    my ($packages) = @_;
+    int (sum map { $_->{size} } grep { $_->{selected} } values %$packages) / sqr(1024);
+}
+sub correctedSelectedSize { correctSize(selectedSize($_[0])) }
+
 sub Package {
     my ($packages, $name) = @_;
     $packages->{$name} or log::l("unknown package `$name'") && undef;