no_comment

8 files changed, 41 insertions, 13 deletions

diff --git a/Makefile b/Makefile
index 18e1a5970..f02fe7f3f 100644
--- a/Makefile
+++ b/Makefile
@@ -87,7 +87,10 @@ upload: clean install
 	upload Mandrake/base *_stage2.gz ;\
 	upload boot '' ;\
 	for i in $(RELEASE_BOOT_IMG); do upload images $$i; done ;\
-	echo 
+	echo
+
+	perl -pe 'exit if /  DrakX </' perl-install/ChangeLog | mail -s 'new DrakX snapshot' changelog@linux-mandrake.com install@linux-mandrake.com
+	tools/addchangelog perl-install/ChangeLog 'snapshot uploaded'
 
 upload_sparc:
 	touch /tmp/mdkinst_done
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 482625928..95d63bef0 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,25 @@
+2000-09-16  Pixel  <pixel@mandrakesoft.com>
+
+	* install_steps_interactive.pm (choosePartitionsToFormat): move
+	the setting of toFormat before asking for bad blocks, seems to fix
+	things?? weird :-/
+
+	* network.pm (miscellaneousNetwork): fix the setting of focus on
+	error (tx2Thomas Poindessous :)	
+
+	* install_steps_interactive.pm (configurePrinter): changed
+	"Cancel" to "None" (for Thomas Poindessous :)
+
+	* printer.pm (poll_ppd_base): max polling time raised from 10s to
+	30s (for Till)	
+
+	* install_steps.pm (ask_mntpoint_s): don't force partition type to
+	be ext2 (at least if it's a known fs) (for Warly)
+
+2000-09-15  DrakX <install@linux-mandrake.com>
+
+	* snapshot uploaded
+
 2000-09-15  Pixel  <pixel@mandrakesoft.com>
 
 	* install_steps_gtk.pm (set_help): save the help message displayed
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index 61c3efcec..300a06ecb 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -181,9 +181,6 @@ sub ask_mntpoint_s {
 
     #- TODO: set the mntpoints
 
-    #- assure type is at least ext2
-    (fsedit::get_root($fstab) || {})->{type} = 0x83;
-
     my %m; foreach (@$fstab) {
 	my $m = $_->{mntpoint};
 
@@ -193,7 +190,7 @@ sub ask_mntpoint_s {
 	$m{$m} = 1;
 
 	#- in case the type does not correspond, force it to ext2
-	$_->{type} = 0x83 if $m =~ m|^/| && !isFat($_);
+	$_->{type} = 0x83 if $m =~ m|^/| && !isFat($_) && !isTrueFS($_);
     }
     1;
 }
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index d679ca432..5b4930a91 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -278,6 +278,7 @@ sub choosePartitionsToFormat($$) {
 
     return if $::beginner && 0 == grep { ! $_->{toFormat} } @l;
 
+    #- keep it temporary until the guy has accepted
     my %toFormat = map { $_ => $_->{toFormat} || $_->{toFormatUnsure} } @l;
 
     my %label;
@@ -290,11 +291,13 @@ sub choosePartitionsToFormat($$) {
     $o->ask_many_from_list_ref('', _("Choose the partitions you want to format"),
 			       [ map { $label{$_} } @l ],
 			       [ map { \$toFormat{$_} } @l ]) or die "cancel";
+    #- ok now we can really set toFormat
+    $_->{toFormat} = $toFormat{$_} foreach @l;
+
     @l = grep { $_->{toFormat} && !isLoopback($_) && !isReiserfs($_) } @l;
     $o->ask_many_from_list_ref('', _("Check bad blocks?"),
 			       [ map { $label{$_} } @l ],
 			       [ map { \$_->{toFormatCheck} } @l ]) or goto &choosePartitionsToFormat if $::expert;
-    $_->{toFormat} = $toFormat{$_} foreach @l;
 }
 
 
@@ -583,9 +586,9 @@ sub configurePrinter {
     $::expert or $o->{printer}{mode} ||= 'CUPS';
     if ($::expert || !$o->{printer}{mode}) {
 	$o->{printer}{mode} = $o->ask_from_list_([''], _("Which printing system do you want to use?"),
-						 [ 'CUPS', 'lpr', __("Cancel") ],
+						 [ 'CUPS', 'lpr', __("None") ],
 						);
-	$o->{printer}{want} = $o->{printer}{mode} ne 'Cancel';
+	$o->{printer}{want} = $o->{printer}{mode} ne 'None';
 	$o->{printer}{want} or $o->{printer}{mode} = undef, return;
     }
 
diff --git a/perl-install/network.pm b/perl-install/network.pm
index a98dce762..ddc601ef7 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -339,8 +339,8 @@ sub miscellaneousNetwork {
          \$u->{ftp_proxy},
        ],
        complete => sub {
-	   $u->{http_proxy} =~ m,^($|http://), or $in->ask_warn('', _("Proxy should be http://...")), return 1,3;
-	   $u->{ftp_proxy} =~ m,^($|ftp://), or $in->ask_warn('', _("Proxy should be ftp://...")), return 1,4;
+	   $u->{http_proxy} =~ m,^($|http://), or $in->ask_warn('', _("Proxy should be http://...")), return 1,0;
+	   $u->{ftp_proxy} =~ m,^($|ftp://), or $in->ask_warn('', _("Proxy should be ftp://...")), return 1,1;
 	   0;
        }
     ) || return;
diff --git a/perl-install/printer.pm b/perl-install/printer.pm
index feb37eb2a..01fe4c76e 100644
--- a/perl-install/printer.pm
+++ b/perl-install/printer.pm
@@ -369,7 +369,7 @@ sub poll_ppd_base {
     run_program::rooted($prefix, "ifup lo"); #- else cups will not be happy!
     run_program::rooted($prefix, "/etc/rc.d/init.d/cups start");
 
-    foreach (1..10) {
+    foreach (1..30) {
 	local *PPDS; open PPDS, ($::testing ? "$prefix" : "chroot $prefix/ ") . "/usr/bin/poll_ppd_base -a |";
 	foreach (<PPDS>) {
 	    chomp;
diff --git a/tools/extractchangelog b/tools/extractchangelog
new file mode 100644
index 000000000..d838a0b68
--- /dev/null
+++ b/tools/extractchangelog
@@ -0,0 +1,2 @@
+#!/usr/bin/perl
+
diff --git a/tools/make_mdkinst_stage2 b/tools/make_mdkinst_stage2
index 80075ce0b..97b989e93 100755
--- a/tools/make_mdkinst_stage2
+++ b/tools/make_mdkinst_stage2
@@ -6,9 +6,10 @@
     exit
 }
 
-STAGE2TMP=/tmp/stage2_tmp
+TMPDIR=${TMPDIR=/tmp}
+STAGE2TMP=$TMPDIR/stage2_tmp
 MKE2FS="/sbin/mke2fs -q -m 0 -F -s 1"
-MNTPOINT=/tmp/stage2_img
+MNTPOINT=$TMPDIR/stage2_img
 REP4PMS=/usr/bin/perl-install
 DEST=$1
 STAGE2=$2