updated

5 files changed, 82 insertions, 17 deletions

diff --git a/Makefile b/Makefile
index d3e8a10c5..ac5de68f5 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ upload: clean install
 upload_firewall: clean install
 	function upload() { rsync -qSavz --verbose --exclude '*~' -e ssh --delete $(ROOTDEST)/$$1/$$2 mandrake@kenobi2:/mnt/port/build/corporate/pieces/install.firewall/$$1; } ;\
 	upload Mandrake/mdkinst '' ;\
-	upload Mandrake/base compss* ;\
+#	upload Mandrake/base compss* ;\
 	upload Mandrake/base *_stage2.gz ;\
 	upload boot '' ;\
 	upload misc genbasefiles ;\
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index 541d090cc..de07b67c7 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,51 @@
+2001-01-11  DrakX <install@linux-mandrake.com>
+
+	* dams : firewall snapshot uploaded
+
+2001-01-10  DrakX <install@linux-mandrake.com>
+
+	* dams : firewall snapshot uploaded
+
+2001-01-09  DrakX <install@linux-mandrake.com>
+
+	* dams : firewall snapshot uploaded
+
+2001-01-04  DrakX <install@linux-mandrake.com>
+
+	* dams : firewall snapshot uploaded
+
+2001-01-02  DrakX <install@linux-mandrake.com>
+
+	* dams : firewall snapshot uploaded
+
+2000-12-23  DrakX <install@linux-mandrake.com>
+
+	* dams : firewall snapshot uploaded
+
+2000-12-23  DrakX <install@linux-mandrake.com>
+
+	* snapshot uploaded
+
+2000-12-22  DrakX <install@linux-mandrake.com>
+
+	* snapshot uploaded
+
+2000-12-20  DrakX <install@linux-mandrake.com>
+
+	* dams : firewall snapshot uploaded
+
+2000-12-19  DrakX <install@linux-mandrake.com>
+
+	* dams : firewall snapshot uploaded
+
+2000-12-19  DrakX <install@linux-mandrake.com>
+
+	* snapshot uploaded
+
+2000-12-19  DrakX <install@linux-mandrake.com>
+
+	* dams : firewall snapshot uploaded
+
 2000-12-12  DrakX <install@linux-mandrake.com>
 
 	* dams : firewall snapshot uploaded
diff --git a/perl-install/install_steps.pm b/perl-install/install_steps.pm
index b07443235..b6d885a78 100644
--- a/perl-install/install_steps.pm
+++ b/perl-install/install_steps.pm
@@ -603,6 +603,27 @@ sub setRootPassword($) {
 	print F $_;
     }
 }
+sub setAdminPassword($) {
+    my ($o) = @_;
+    my $p = $o->{prefix};
+    my $u = $o->{adminuser} ||= {};
+
+    $u->{pw} ||= $u->{password} && any::crypt($u->{password}, $o->{authentication}{md5});
+
+    my @lines = cat_(my $f = "$p/etc/passwd") or log::l("missing passwd file"), return;
+
+    local *F;
+    open F, "> $f" or die "failed to write file $f: $!\n";
+    foreach (@lines) {
+	if (/^admin:/) {
+	    chomp;
+	    my %l; @l{@etc_pass_fields} = split ':';
+	    add2hash($u, \%l);
+	    $_ = join(':', @$u{@etc_pass_fields}) . "\n";
+	}
+	print F $_;
+    }
+}
 
 #------------------------------------------------------------------------------
 
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index 919b9bf65..a7da036af 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -841,25 +841,21 @@ sub addUser {
 	}
     }
     if ($o->{meta_class} eq 'firewall') {
-	my $v;
-	my $p = $o->{prefix};
-	substInFile { /^admin:/ and $_=''; } "$p/etc/passwd";
-	substInFile { /^admin:/ and $_=''; } "$p/etc/group";
-	$v->{shell} ||= "/bin/bash";
-	$o->ask_from_entries_refH([_("Set admin password"), _("Ok"), $o->{security} > 2 || $::corporate ? () : _("No password")],
+	my $sup = $o->{adminuser} ||= {};
+	$sup->{password2} ||= $sup->{password} ||= "";
+	$o->ask_from_entries_refH([_("Set admin password"), _("Ok")],
 				  [ _("Set admin password"), "\n" ], [
-								      _("Password") => { val => \$admin->{password},  hidden => 1 },
-								      _("Password (again)") => { val => \$admin->{password2}, hidden => 1 }
-								     ],
+								     _("Password") => { val => \$sup->{password},  hidden => 1 },
+								     _("Password (again)") => { val => \$sup->{password2}, hidden => 1 },
+								    ],
 				  complete => sub {
-				      $admin->{password} eq $admin->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,1);
-				      length $admin->{password} < 2 * $o->{security}
+				      $sup->{password} eq $sup->{password2} or $o->ask_warn('', [ _("The passwords do not match"), _("Please try again") ]), return (1,1);
+				      length $sup->{password} < 2 * $o->{security}
 					and $o->ask_warn('', _("This password is too simple (must be at least %d characters long)", 2 * $o->{security})), return (1,0);
 				      return 0
 				  }
-				 );
-    	add2hash_($v, { name => "admin", password => $admin->{password}, realname => "Administrator", icon => 'automagic' });
-	push @{$o->{users}}, $v;
+				 ) or return;
+	install_steps::setAdminPassword($o);
     }
     install_steps::addUser($o);
 }
@@ -1136,7 +1132,7 @@ Do you really want to quit now?"), 0);
 		     _("IMPORTANT, please read :
 
 For further configuration after installation, use a browser
-from any computer connected to your LAN, and connect on :
+from any computer connected to your LAN, and connect to :
 https://") . ($o->{intf}{eth0}->{BOOTPROTO} eq 'static' ? $o->{intf}{eth0}->{IPADDR} : $o->{netc}{HOSTNAME} ) . _(":8443/
 
 Log on with your admin account"));
diff --git a/update_kernel b/update_kernel
index f189c0150..b271de8ec 100755
--- a/update_kernel
+++ b/update_kernel
@@ -42,7 +42,7 @@ cp -f $KERNEL_BOOT_PATH/boot/System.map* System.map
 rm -rf modules ; install -d modules
 (cd modules ; 
     cp -f `find ../"$KERNEL_BOOT_PATH"/lib/modules/ -name "*.o"` .
-    /sbin/depmod -m ../System.map -i -e *.o | perl -pe 's/\\\n//' | perl -ne 's/\.o//g; s/[ \t]+/ /g; print if /: /' > modules.dep
+    /sbin/depmod -F ../System.map -e *.o | perl -pe 's/\\\n//' | perl -ne 's/\.o//g; s/[ \t]+/ /g; print if /: /' > modules.dep
     perl -pi -e 's/((plip|ppa|imm): parport)/$1 parport_pc/' modules.dep
     ls *.o               | packdrake -b9s modules.cz 400000
     ls *.o               | cpio --quiet -H crc -o | bzip2 -9> modules.cpio.bz2